delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	Fix Slack notification URL and remove the usage of Ci::RoutesHelper	Kamil Trzcinski	2015-09-22	1	-29/+0
\| \| \|
* \| \|	Merge branch 'rs-help-page' into 'master'	Douwe Maan	2015-09-24	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Help page improvements - Only signed-in users can see version information - Add "Community Edition" text so the header is less barren when version information is hidden - Minor copy edits - Make all "Quick help" link text the entire body of the link. Prior, it wasn't obvious which part of each item was an actual link. Closes #2721 See merge request !1415
\| * \| \|	Move the `version_check_enabled` check from view to helper	Robert Speicher	2015-09-23	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'fix-network-graph-refs' into 'master'	Douwe Maan	2015-09-24	1	-1/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove git refs used internally by GitLab from network graph GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/150eb7ae5f07f0d4793589b5eac462db/image.png) Closes #2702 See merge request !1410
\| * \| \|	Remove git refs used internally by GitLab from network graph	Stan Hu	2015-09-23	1	-1/+4
\| \|/ / \| \| \| \| \| \| \| \| \|	Closes #2702
* \| \|	Merge branch 'fix-markdown-truncation-removing-links' into 'master'	Robert Speicher	2015-09-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cases where Markdown did not render links in activity feed HTML would be stripped in `truncate_if_block` when a comment had multiple lines and the first wasn't long enough to be truncated. The use of `node.content` would strip all HTML tags. Using `node.inner_html` retains these tags and puts the "..." in between paragraph tags. Closes #2586 See merge request !1401
\| * \| \|	Fix cases where Markdown did not render links in activity feed	Stan Hu	2015-09-22	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	HTML would be stripped in `truncate_if_block` when a comment had multiple lines and the first wasn't long enough to be truncated. The use of `node.content` would strip all HTML tags. Using `node.inner_html` retains these tags and puts the "..." in between paragraph tags. Closes #2586
* \| \|	Show CI status on all pages where commits list is rendered	Dmitriy Zaporozhets	2015-09-23	2	-1/+35
\|/ / \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Link project repo size to filesrepo-size-link	Douwe Maan	2015-09-21	1	-2/+2
\| \|
* \|	Merge branch 'notification-levels' into 'master'	Douwe Maan	2015-09-21	1	-0/+45
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Notification levels can now be set on the Project's main page ![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png) The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level. Saving is done via a remote form submission and if successful shows the user a flash message: ![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png) @DouweM can you please review my code. I gave my bestest effort to make in clean and readable. @rspeicher hopefully we can include it with the 8.0 release, maybe? /cc @darby See merge request !1322
\| * \|	Minor code cleanupnotification-levels	Douwe Maan	2015-09-20	1	-9/+6
\| \| \|
\| * \|	Merge branch 'master' into notification-levels	Patricio Cano	2015-09-16	13	-3/+379
\| \|\ \
\| * \ \	Merge branch 'master' into notification-levels	Patricio Cano	2015-09-16	4	-18/+85
\| \|\ \ \
\| * \| \| \|	Added Global to the drop downs and updated the label of the button to show ↵	Patricio Cano	2015-09-16	1	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the current level instead of `Notifications`
\| * \| \| \|	Notification dropdown now shows currently active level, and also shows what ↵	Patricio Cano	2015-09-14	1	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the actual value of `global` is, if the project has the notification level set to global.
\| * \| \| \|	Corrected `case` indentation to conform with Rubocop	Patricio Cano	2015-09-14	1	-22/+22
\| \| \| \| \|
\| * \| \| \|	Added spacing to icons in Notification drop down	Patricio Cano	2015-09-14	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Notification level can now be saved from within the project view.	Patricio Cano	2015-09-14	1	-8/+12
\| \| \| \| \|
\| * \| \| \|	Fixed notification level list item helper.	Patricio Cano	2015-09-14	1	-12/+8
\| \| \| \| \|
\| * \| \| \|	PAtrially working notification button	Darby	2015-09-14	1	-0/+31
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-markdown-links-in-dashboard' into 'master'	Douwe Maan	2015-09-21	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Markdown links not showing up in dashboard activity feed Closes #2586 See merge request !1353
\| * \| \| \| \|	Fix Markdown links not showing up in dashboard activity feed	Stan Hu	2015-09-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2586
* \| \| \| \| \|	Cleanup GitLab CI UIci-build-list	Dmitriy Zaporozhets	2015-09-19	3	-37/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'master' into ci-build-list	Dmitriy Zaporozhets	2015-09-18	2	-40/+5
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Merge branch 'master' into project-header-titles	Douwe Maan	2015-09-18	2	-109/+3
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Move project header title definition to view in question.	Douwe Maan	2015-09-17	2	-40/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Style CI project/build list	Dmitriy Zaporozhets	2015-09-18	2	-11/+11
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Remove duplicate code	Kamil Trzcinski	2015-09-17	1	-108/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Check current_controller against controller_path	Kamil Trzcinski	2015-09-17	1	-1/+3
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The controller_path includes namespaces, where controller_name only includes the class name without controller
* \| \| \| \|	Merge branch 'fix-issue-2382' into 'master'	Stan Hu	2015-09-17	1	-0/+11
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
\| * \| \| \|	Create a "destroyed Milestone" event and keep Milestone events around in the DB	Stan Hu	2015-09-15	1	-0/+11
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
* \| \| \|	Eliminate combined image_tag and image_path in providers list	Stan Hu	2015-09-16	1	-1/+1
\| \| \| \|
* \| \| \|	Fix default avatars to ensure that helpers don't have /assets dir appended	Stan Hu	2015-09-16	2	-2/+2
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into ↵	Kamil Trzcinski	2015-09-15	3	-18/+63
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
\| * \| \|	Add current_ref helper methodheader-titles	Dmitriy Zaporozhets	2015-09-14	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Add page titles to header for group and project	Dmitriy Zaporozhets	2015-09-14	2	-17/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Fix tooltip display in list views	Drew Blessing	2015-09-14	1	-1/+1
\| \| \| \|
* \| \| \|	Make small ui fixes for CI	Dmitriy Zaporozhets	2015-09-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Fix navigation and header tile	Kamil Trzcinski	2015-09-14	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant navigation on commits and builds page
* \| \| \|	Fix build triggers URL and slack notifications	Kamil Trzcinski	2015-09-14	2	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g	Dmitriy Zaporozhets	2015-09-11	1	-0/+22
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Fix fixed layout	Dmitriy Zaporozhets	2015-09-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Style panels and add blank container	Dmitriy Zaporozhets	2015-09-09	1	-0/+22
\| \|/ / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'ui-improvements' into 'master'	Dmitriy Zaporozhets	2015-09-07	1	-0/+9
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ui improvements * fix project home page when activity set as default * style commits, branches and tags pages to new style * render flash message outside of content block * style group pages See merge request !1255
\| \| * \|	Restyle group pages. Merge header with page title	Dmitriy Zaporozhets	2015-09-07	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'crowd' into 'master'	Valery Sizov	2015-09-07	1	-1/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
\| \| * \| \|	Crowd integration	Valery Sizov	2015-09-02	1	-1/+5
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'fix-wiki-page-history' into 'master'	Douwe Maan	2015-09-07	1	-24/+0
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken Wiki Page History This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes. Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399 See merge request !1232
\| \| * \|	Fix broken Wiki Page History	Stan Hu	2015-09-01	1	-24/+0
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
\| * \|	Fix tests	Dmitriy Zaporozhets	2015-09-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>