home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,189 Commits 48 Branches 340 Tags
00a33d67aa5dfcfbc63182106162041d2c60f4de
Commit Graph
8918 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 00a33d67aa Merge branch 'improve-hipchat-service-test' into 'master' 
Provide more feedback what went wrong if HipChat service failed test

This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks.

Screenshot:

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

Issue gitlab-com/support-forum#213

See merge request !1144
 2015-08-13 11:43:44 +00:00
Dmitriy Zaporozhets 167ab75365 Merge branch 'bring-clonebar-back' into 'master' 
Bring clone bar back

Screenshot:

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

See discussion in !1080

See merge request !1147
 2015-08-13 10:56:01 +00:00
Stan Hu 7d1c06793e Merge branch 'note-query-information' into 'master' 
Note query information

See merge request !1149
 2015-08-12 23:36:29 +00:00
Ben Boeckel 95f8f7c729 api: add 'system', 'upvote', and 'downvote' fields to note queries 
This reverts commit 4c586dc7c2.
 2015-08-12 17:02:33 -04:00
Stan Hu 518aa7dca6 Bring clone bar back 
See discussion in !1080
 2015-08-12 14:00:59 -07:00
Dmitriy Zaporozhets 6a82c9f018 Merge branch 'mr-merge-manually-2' into 'master' 
Move merge manually text below merge widget 

Replace !1121 

Screenshot: 

#### Before

![Screenshot_2015-08-10_18.25.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ac7df8dd03104b3b44c61b3bff709653/Screenshot_2015-08-10_18.25.22.png)


#### After

![Screenshot_2015-08-10_18.28.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c92b8eaeadb842705577dba1f52b67e5/Screenshot_2015-08-10_18.28.30.png)



See merge request !1141
 2015-08-12 16:06:16 +00:00
Stan Hu 2379057002 Provide more feedback what went wrong if HipChat service failed test 
Issue gitlab-com/support-forum#213
 2015-08-12 07:31:25 -07:00
Florent (HP) 8adf6ba8f5 Add merged label on branches page 2015-08-11 23:00:46 +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 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 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
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
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 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 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
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
Valery Sizov 5bdcdf5616 Fast blame 2015-08-11 09:15:00 +03:00
Jeff Blaine 773545d533 Fix instructions for empty repo + existing files 
Fixes #2242
 2015-08-10 14:53:44 -04:00
Stan Hu e6ef058289 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 occured.

Closes #2241
 2015-08-10 11:44:39 -07:00
Stan Hu 6a6697c393 Add README to list of files in project page if activity feed setting in use 
Closes #2044
 2015-08-10 07:31:57 -07:00
Tom Webster 3bb2aa9f98 Link username to profile on Group Members page 
When browsing GitLab, a user may want to view a particular user's
other contributions or profile information. This link helps make
that process seamless.
 2015-08-10 08:32:17 -04:00
Douwe Maan 4a2b7cef57 Merge branch 'master' into check-out-branch-button 2015-08-10 14:16:40 +02:00
Dmitriy Zaporozhets 151d9fb35f 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-10 12:13:26 +00:00
Dmitriy Zaporozhets 819d110cab Merge branch 'trigger-hooks' into 'master' 
Trigger post-receive hooks after commits are made by GitLab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1127
 2015-08-10 11:57:53 +00:00
Dmitriy Zaporozhets 3752172dcd Merge branch 'fix-event-cache' into 'master' 
Fix event cache

Fixes #2236.

See merge request !1128
 2015-08-10 11:17:05 +00:00
Dmitriy Zaporozhets 59e7b7a654 Refactor Trigger post-receive hooks after commits are made by GitLab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 13:15:36 +02:00
Douwe Maan 0d1c260122 Fix event cache 2015-08-10 12:31:34 +02:00
Dmitriy Zaporozhets 99585a738c Trigger post-receive hoooks when commits are made by GitLab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 10:54:42 +02:00
Stan Hu 77f37fa909 Merge branch 'dropzone-upload-progress' into 'master' 
Add dropzone upload progress

This MR adds upload progress in percents to dropzone.

![progress](https://gitlab.com/vernik91/gitlab-ce/uploads/9be251e4f3a99bc1d65435b1f001d021/progress.png)

I thought, it can be nice small enhancement :)

See merge request !1125
 2015-08-10 08:05:37 +00:00
Nikita Verkhovin 17bab5022f Add dropzone upload progress 2015-08-10 13:18:02 +06:00