root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
18,287 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

18287 Commits

Author SHA1 Message Date
Florent (HP) 8adf6ba8f5 Add merged label on branches page 2015-08-11 23:00:46 +02:00
Dmitriy Zaporozhets 69c193e78a
Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 22:48:55 +02:00
Dmitriy Zaporozhets 3c036ea157
Fix changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:56:11 +02:00
Dmitriy Zaporozhets ff10543403
Move merge manually text below merge widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:55:01 +02:00
Dmitriy Zaporozhets cb6ad67f52 Merge branch 'check-out-branch-button' into 'master' 
Add "Check out branch" button to the MR page.

I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. 

Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120.

![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png)

It looks even better in combination with !1121, which gets rid of the "If you want to ..." line:

![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png)

cc @dzaporozhets @rspeicher 

See merge request !1116
 2015-08-11 17:49:06 +00:00
Dmitriy Zaporozhets a0cd4f8fb4 Merge branch 'improve-merge-request-widget' into 'master' 
Improve merge request widget

Return merge request widget improvements that were reverted with satellites

See merge request !1140
 2015-08-11 17:46:38 +00:00
Dmitriy Zaporozhets 91836272fe Merge branch 'mr-widget-text' into 'master' 
Improve text of MR merge widget and manual merge modal

Modal with manual merge instructions:

![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png)

Archived:

![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png)

WIP:

![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png)

Missing target branch:

![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png)

Missing source branch:

![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png)

Nothing to merge:

![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png)

Checking ability to merge:

![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png)

Conflicts when allowed to merge:

![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png)

Conflicts when not allowed to merge:

![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png)

Mergeable when allowed to merge:

![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png)

Mergeable when not allowed to merge:

![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png)

Merge in progress:

![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png)

Merge failed:

![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png)

Merged:

![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png)

Closed:

![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png)

cc @dzaporozhets @rspeicher

See merge request !1120
 2015-08-11 19:24:50 +02:00
Dmitriy Zaporozhets eaba65fe50 Move command line insturction out of mr widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:24:42 +02:00
Dmitriy Zaporozhets 48e76c04a7 Refactor merge request widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:17:02 +02:00
Dmitriy Zaporozhets 3e0ba775ed Move command line insturction out of mr widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 19:15:49 +02:00
Dmitriy Zaporozhets 630a9421ed Merge branch 'optimize-haml-textarea-rendering' into 'master' 
Bump Haml to 4.0.7 to speed up textarea rendering

The current regexp caused long load times when textarea blocks were surrounded by whitespace. This fix has been submitted to the Haml library and passes tests there:

https://github.com/haml/haml/pull/850

Closes #1987

See merge request !984
 2015-08-11 17:10:45 +00:00
Dmitriy Zaporozhets fed202f677 Merge branch 'grit_blame' into 'master' 
Fast blame

Improve performance for file blame page. Also bring some small UI improvements

See merge request !1129
 2015-08-11 14:45:54 +00:00
Dmitriy Zaporozhets 50b1f09ab2
Small UI improvements to git blame page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 16:24:29 +02:00
Dmitriy Zaporozhets 43e1520033 Merge branch 'drop-username-tree-row' into 'master' 
Drop the user name from tree row to improve readability of commit messages

Follow up to MR !579

/cc @dzaporozhets

See merge request !1124
 2015-08-11 13:57:47 +00:00
Dmitriy Zaporozhets 59176c1026 Merge branch 'master' into 'master' 
Link username to profile on Group Members page

When browsing a GitLab group, a user may want to view a particular user's
other contributions or profile information. This link helps make
that process seamless.

See merge request !1099
 2015-08-11 13:56:11 +00:00
Stan Hu fa58a85ed0 Improve error message display when project fails to import 2015-08-11 06:36:42 -07:00
Dmitriy Zaporozhets d25c56cfd8
Update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 14:41:31 +02:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets c0bf026ed8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-11 14:29:43 +02:00
Dmitriy Zaporozhets 7f3228ec74 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-11 14:29:36 +02:00
Dmitriy Zaporozhets 5daf44b7c8 Merge branch 'revert-satellites' into 'master' 
Revert satellites

Return satellites to master for 7.14

We remove satellites in next release (8.0)

See merge request !1136
 2015-08-11 12:27:38 +00:00
Valery Sizov cf6e58b589 update gitlab_git 2015-08-11 15:11:58 +03:00
Dmitriy Zaporozhets 3a63c00505
Fix file api tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 13:47:37 +02:00
Dmitriy Zaporozhets b9b9fe70b8 Revert "Fix editing files via API" 
This reverts commit 7bde6ae540.
 2015-08-11 13:29:35 +02:00
Dmitriy Zaporozhets 9d029a05f1
Revert "Merge branch 'web-editor-rugged' into 'master'" 
This reverts commit 5a1aa49b55, reversing
changes made to a675bea2c1.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 13:04:38 +02:00
Dmitriy Zaporozhets 40b1703263
Fix gemfile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:53:49 +02:00
Dmitriy Zaporozhets 9bc512314a
Revert "Create and edit files in web editor via rugged" 
This reverts commit 734a4ba87d.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:52:33 +02:00
Dmitriy Zaporozhets 0806605962
Revert "Fix adding new file to empty repo" 
This reverts commit 27a158506e.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:51:26 +02:00
Dmitriy Zaporozhets 815e678c4e Revert "Use rugged in web editor for base64 encoding" 
This reverts commit 541133197b.
 2015-08-11 11:50:48 +02:00
Dmitriy Zaporozhets 34975f0180 Revert "Create activity event and execute hooks on web editor commit" 
This reverts commit 3d416f1682.
 2015-08-11 11:50:43 +02:00
Dmitriy Zaporozhets 24332b7b99 Revert "Make web editor work correctly after switch from satellites" 
This reverts commit 435f680b89.
 2015-08-11 11:49:29 +02:00
Dmitriy Zaporozhets d4cfa0bf76
Revert "Refactor web editor" 
This reverts commit dfccb06dda.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:49:09 +02:00
Dmitriy Zaporozhets 79b294267a
Remove changelog items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:40:39 +02:00
Dmitriy Zaporozhets 1891cab44c
Fix conflict issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 11:12:35 +02:00
Dmitriy Zaporozhets 3b02ad8467 Revert "Merge branches inside one repository using rugged instead of satellites" 
This reverts commit d24c40ec21.
 2015-08-11 10:50:39 +02:00
Dmitriy Zaporozhets 32046983ad
Revert "Merge branch 'refactor-can-be-merge' into 'master'" 
This reverts commit 459e6d3467, reversing
changes made to 804168e1de.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:48:02 +02:00
Dmitriy Zaporozhets 9f10943c1a
Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets 84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' " 
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
 2015-08-11 10:26:19 +02:00
Dmitriy Zaporozhets f293d991a4 Revert "Merge branch 'mr-widget-text' into 'master' " 
This reverts commit 151d9fb35f, reversing
changes made to 819d110cab.
 2015-08-11 10:26:12 +02:00
Douwe Maan 2f706fbd23 Merge branch 'fix-broken-code-import' into 'master' 
Fix broken code import and display error messages if something went wrong with creating project

Clicking "Import" in Bitbucket import status page would result in:

```
  Rendered import/base/create.js.haml (38.3ms)
Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms)

NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>:
  actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url'
  actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path'
  actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for'
  turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer'
  actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to'
  app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700'
  actionview (4.1.11) lib/action_view/template.rb:145:in `block in render'
  activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument'
  actionview (4.1.11) lib/action_view/template.rb:339:in `instrument'
  actionview (4.1.11) lib/action_view/template.rb:143:in `render'
  rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method'
  actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template'
  actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument'
  activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument'
  activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
  activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument'
```

Also, if the project failed to save for some reason, the user was never informed. Screenshot of new error message dump:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/afc15aa6b0cde0080976eab3199cf18b/image.png)

Closes #2241

See merge request !1134
 2015-08-11 08:02:49 +00:00
Douwe Maan b514a5ee06 Merge branch 'disable-turbolinks-for-bitbucket' into 'master' 
Disable turbolinks when linking to Bitbucket import status

Turbolinks was causing issues with the Bitbucket JavaScript/display because it
was trying to intercept `/import/bitbucket/status` even when a 302 redirection occurred:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/18a8a76bb99a2c9accb0805c23785c1e/image.png)

Closes #2241

See merge request !1131
 2015-08-11 08:00:29 +00:00
Job van der Voort b8d48ca84f Merge branch 'notifications' into 'master' 
Info about not receiving emails

Added additional info because of issue https://gitlab.com/gitlab-com/support-forum/issues/268#note_1846073

See merge request !1920
 2015-08-11 07:43:12 +00:00
Dmitriy Zaporozhets f1f506fcf2 Merge branch 'add-readme-for-activity-feed-setting' into 'master' 
Add README to list of files in project page if activity feed setting in use

Closes #2044

Screenshot:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7da17d8d8172f86965af15fd563d181a/image.png)

See merge request !1021
 2015-08-11 07:23:39 +00:00
Stan Hu f1a241e0ed Fix broken code import and display error messages if something went wrong with creating project 
Clicking "Import" in Bitbucket import status page would result in:

```
  Rendered import/base/create.js.haml (38.3ms)
Completed 500 Internal Server Error in 1362ms (ActiveRecord: 20.2ms)

NoMethodError - undefined method `namespace_projects_path' for #<#<Class:0x007fd6c0f29498>:0x007fd6c0cf09d8>:
  actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:142:in `polymorphic_url'
  actionpack (4.1.11) lib/action_dispatch/routing/polymorphic_routes.rb:148:in `polymorphic_path'
  actionview (4.1.11) lib/action_view/routing_url_for.rb:87:in `url_for'
  turbolinks (2.5.3) lib/turbolinks/xhr_url_for.rb:12:in `url_for_with_xhr_referer'
  actionview (4.1.11) lib/action_view/helpers/url_helper.rb:181:in `link_to'
  app/views/import/base/create.js.haml:23:in `_app_views_import_base_create_js_haml__1092746368522631377_70280180507700'
  actionview (4.1.11) lib/action_view/template.rb:145:in `block in render'
  activesupport (4.1.11) lib/active_support/notifications.rb:161:in `instrument'
  actionview (4.1.11) lib/action_view/template.rb:339:in `instrument'
  actionview (4.1.11) lib/action_view/template.rb:143:in `render'
  rack-mini-profiler (0.9.0) lib/mini_profiler/profiling_methods.rb:108:in `block in profile_method'
  actionview (4.1.11) lib/action_view/renderer/template_renderer.rb:55:in `block (2 levels) in render_template'
  actionview (4.1.11) lib/action_view/renderer/abstract_renderer.rb:38:in `block in instrument'
  activesupport (4.1.11) lib/active_support/notifications.rb:159:in `block in instrument'
  activesupport (4.1.11) lib/active_support/notifications/instrumenter.rb:20:in `instrument'
  activesupport (4.1.11) lib/active_support/notifications.rb:159:in `instrument'
```

Closes #2241
 2015-08-10 23:56:01 -07:00
Achilleas Pipinellis aa0a0dc331 Merge branch 'doc-link-fix' into 'master' 
Doc: Fix link to gravatar.com

See merge request !1133
 2015-08-11 06:26:48 +00:00
Valery Sizov d9402504ad link to the local gitlab_git 2015-08-11 09:16:11 +03:00
Valery Sizov 5bdcdf5616 Fast blame 2015-08-11 09:15:00 +03:00
karen Carias 95aa13f0b7 fixed text 2015-08-10 17:17:30 -07:00
karen Carias e0642b2743 fixed conflict 2015-08-10 16:14:03 -07:00
karen Carias 37b4cfea3a fixed conflict and comment 2015-08-10 16:05:59 -07:00