home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 22:16:15 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,497 Commits 48 Branches 340 Tags
48eccdb2fcfa28c2ab602b76b97ff064195bb113
Commit Graph
2408 Commits
Author SHA1 Message Date
Achilleas Pipinellis cdda827577 Remove check icon from merged requests 
Now that GitLab CI exposes the status of each MR
in the MR page it seems "redundant" to have an
extra icon next to the CI statuses.
 2015-12-10 20:45:54 +02:00
Douwe Maan 4e5897f51e Merge branch 'tmp-reference-pipeline-and-caching' into 'master' 
[Second try] Implement different Markdown rendering pipelines and cache Markdown

!1602 already got merged in bcd89a58e7, but it would appear the merge commit disappeared because of #3816 (or some other reason).

cc @rspeicher 

See merge request !2051
 2015-12-10 14:34:12 +00:00
Douwe Maan 3bfedbd25a Merge branch 'rs-snippets-clipboard' 2015-12-10 14:54:47 +01:00
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching 
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
 2015-12-10 14:04:34 +01:00
Dmitriy Zaporozhets 0549b5e8ee Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-message 
Fix inconsistency with no ssh key message
 2015-12-10 01:28:53 +01:00
Dmitriy Zaporozhets d7044c5ccf Merge branch 'move-network' 2015-12-09 22:21:56 +01:00
Dmitriy Zaporozhets 8f6892500a Merge branch 'rs-delimit-build-counts' into 'master' 
Add number_with_delimiter to build counts



See merge request !2046
 2015-12-09 21:20:53 +00:00
Andrew Tomaka 48bf0a34e2 "No ssh" message should be same on project page 2015-12-09 16:11:21 -05:00
Dmitriy Zaporozhets 7a4d468576 Merge remote-tracking branch 'origin/mr-broken' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 21:06:04 +01:00
Robert Speicher cbac31d923 Add copy-to-clipboard button to Snippets#show 
Closes #3701
 2015-12-09 14:54:54 -05:00
Robert Speicher 98958decce Add number_with_delimiter to build counts 2015-12-09 13:55:31 -05:00
Dmitriy Zaporozhets 2cb542b9d3 remove unnecessary code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 17:39:13 +01:00
Douwe Maan f7ff146aaa Fix size of disabled 'New file' button 2015-12-09 13:52:13 +01:00
Douwe Maan eab086bde1 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	config/routes.rb
 2015-12-09 09:00:25 +01:00
Dmitriy Zaporozhets 1d250b4892 Move Network page from separate tab to sub tab of Commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 02:50:46 +01:00
Dmitriy Zaporozhets 9dd2674963 Fix only 20 group members showing on project member page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 01:43:57 +01:00
Dmitriy Zaporozhets 6213263d32 Merge branch 'mr-builds' into 'master' 
Add Builds tab to MR detail page

## Before

![Screen_Shot_2015-12-08_at_13.21.04](/uploads/0d26060bef78f3de076e33439b8a4789/Screen_Shot_2015-12-08_at_13.21.04.png)

## After

![Screen_Shot_2015-12-08_at_13.25.20](/uploads/be7d7fd6d4fc8c5cc366b5b3778b813a/Screen_Shot_2015-12-08_at_13.25.20.png)

Fixes #3907

See merge request !2016
 2015-12-09 00:05:23 +00:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master' 
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
 2015-12-08 22:04:52 +00:00
Douwe Maan 31b4960eca Fix specs 2015-12-08 22:39:26 +01:00
Douwe Maan fae08104b4 Merge branch 'master' into mr-broken 
# Conflicts:
#	app/helpers/ci_status_helper.rb
 2015-12-08 22:38:29 +01:00
Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green 
# Conflicts:
#	app/views/projects/merge_requests/widget/_heading.html.haml
#	app/views/projects/merge_requests/widget/open/_accept.html.haml
 2015-12-08 22:34:03 +01:00
Douwe Maan 57d71520bd Make tooltip less confusing 2015-12-08 22:30:40 +01:00
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
 2015-12-08 22:26:29 +01:00
Robert Speicher e616739e2f Merge branch 'rs-clipboard-selector' into 'master' 
Make cross-project reference's clipboard target less naive

See !2023

See merge request !2024
 2015-12-08 21:22:17 +00:00
Douwe Maan f66454beaa Add indication to merge request list item that MR cannot be merged automatically 2015-12-08 21:43:11 +01:00
Robert Speicher 813c9b2aeb Make cross-project reference's clipboard target less naive 
See !2023
 2015-12-08 15:29:46 -05:00
Robert Speicher bcd89a58e7 Merge branch 'reference-pipeline-and-caching' into 'master' 
Implement different Markdown rendering pipelines and cache Markdown

Builds on !1090. 

Related to !1014.

Fixes #2054.

See merge request !1602
 2015-12-08 20:22:23 +00:00
Robert Speicher ebee5077f2 Make tab target selectors less naive 
Prior, any of the specified IDs could have been hijacked by a table of
contents header, breaking the tab functionality. For example, a `##
Notes` header would get the id `notes` and prevent the Discussion tab
from being activated.

Closes #3908
 2015-12-08 14:47:28 -05:00
Dmitriy Zaporozhets 7234610010 Merge remote-tracking branch 'origin/ui/misc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 18:50:02 +01:00
Dmitriy Zaporozhets 54d0ff982b Merge branch 'build-related-fixes' into 'master' 
Build related UI fixes

## Before

![Screen_Shot_2015-12-08_at_13.15.21](/uploads/b72ed55da1f0ec953d2eb077fa4fbb18/Screen_Shot_2015-12-08_at_13.15.21.png)

## After

![Screen_Shot_2015-12-08_at_13.15.01](/uploads/144d8099e2724a51125e392dcbd43ed4/Screen_Shot_2015-12-08_at_13.15.01.png)


See merge request !2015
 2015-12-08 17:06:11 +00:00
Robert Speicher befff32ecb Merge branch 'languages-graph' into 'master' 
Languages graph

See merge request !2009
 2015-12-08 16:56:39 +00:00
Douwe Maan 82ddd738b6 Show tooltip when trying to edit file when not on branch 2015-12-08 17:10:07 +01:00
Douwe Maan f39ff54290 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 16:18:18 +01:00
Douwe Maan 15925290ee Merge branch 'master' into ui/dashboard-new-issue 2015-12-08 15:22:04 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master' 
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
 2015-12-08 14:19:52 +00:00
Douwe Maan 75486f09c4 Merge branch 'master' into zj/gitlab-ce-merge-if-green 2015-12-08 13:43:45 +01:00
Douwe Maan 926c3bef9f Merge branch 'master' into reference-pipeline-and-caching 2015-12-08 13:40:32 +01:00
Douwe Maan c767d0e6bd Change text of MR widget heading 2015-12-08 13:22:17 +01:00
Douwe Maan 14969ac87f Add '#' to build page title 2015-12-08 13:17:05 +01:00
Douwe Maan 1567572e79 Add Builds tab to MR detail page 2015-12-08 13:11:41 +01:00
Douwe Maan a17ba43bfd Move commit builds to partial 2015-12-08 13:10:33 +01:00
Douwe Maan 9907a7e6ed Get ci_commit in MR controller 2015-12-08 13:06:55 +01:00
Douwe Maan 35fd7112bf Link builds list status to build details 2015-12-08 13:06:55 +01:00
Douwe Maan 526e64e0c4 Show "#123" instead of "Builds #123" to make column smaller 2015-12-08 13:06:54 +01:00
Douwe Maan b53769aedc Change "Cancel all" to "Cancel running" 2015-12-08 13:06:54 +01:00
Douwe Maan 1b5302f8e7 Reduce MR/issue duplication 2015-12-08 13:06:54 +01:00
Douwe Maan 90a4653593 Remove top border from build page 2015-12-08 13:06:54 +01:00
Douwe Maan f523c3c685 Use gray content block for network graph header 2015-12-08 13:06:54 +01:00
Douwe Maan f8fdec687f Fix padding around protected branches well 2015-12-08 13:06:53 +01:00