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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \|	Merge pull request #9335 from stefan-it/documentation/timezone-clarifications	Jeroen van Baarsen	2015-05-28	1	-3/+15
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|	[Documentation] non-omnibus instructions for changing time zone
\| \| * \| \| \| \| \|	Adds new section for changing time zone in GitLab configuration file. New ↵	Stefan Schweter	2015-05-27	1	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	section added for changing time zone in Omnibus installations.
* \| \| \| \| \| \| \|	Merge branch 'chlg-update' into 'master'	Marin Jankovski	2015-05-28	1	-7/+14
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update changelog for 7.11.4 See merge request !1833
\| * \| \| \| \| \| \|	update changelog for 7.11.4	Job van der Voort	2015-05-28	1	-7/+14
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #9184 from rumpelsepp/english	Jeroen van Baarsen	2015-05-28	1	-17/+18
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	Some language improvements
\| * \| \| \| \| \|	Some language improvements	Stefan Tatschner	2015-05-27	1	-17/+18
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-persist-tab-selection' into 'master'	Dmitriy Zaporozhets	2015-05-28	4	-59/+100
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Persist current merge request tab selection via URL Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350 See merge request !728
\| * \| \| \| \| \|	Persist current merge request tab selection via URLrs-persist-tab-selection	Robert Speicher	2015-05-27	4	-59/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
* \| \| \| \| \| \|	Merge branch 'header-icons' into 'master'	Dmitriy Zaporozhets	2015-05-28	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change some header icons icons changed: * profile settings: user icon to cog * admin area: cogs to wrench Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/719#note_1289290 ![Screenshot_2015-05-27_17.58.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/762de4afb8ae229a96ead8b2d213b2a4/Screenshot_2015-05-27_17.58.12.png) See merge request !726
\| * \| \| \| \| \| \|	Replace some icons in headerheader-icons	Dmitriy Zaporozhets	2015-05-27	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'rs-no-killers-in-development' into 'master'	Marin Jankovski	2015-05-28	1	-4/+7
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable Unicorn::WorkerKiller in non-production environments Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2281 See merge request !729
\| * \| \| \| \| \| \|	Disable Unicorn::WorkerKiller in non-production environmentsrs-no-killers-in-development	Robert Speicher	2015-05-27	1	-4/+7
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'rs-dont-follow-me' into 'master'	Douwe Maan	2015-05-27	5	-2/+89
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ExternalLinkFilter to Markdown pipeline Forces a `rel="nofollow"` attribute on all external links. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_46525 See merge request !727
\| * \| \| \| \| \|	Add ExternalLinkFilter to Markdown pipeliners-dont-follow-me	Robert Speicher	2015-05-27	5	-2/+89
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forces a `rel="nofollow"` attribute on all external links.
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-27	18	-47/+131
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'browse-milestone-issues' into 'master'	Douwe Maan	2015-05-27	14	-46/+116
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix milestone "Browse Issues" button. After refactoring around issue/merge requests filters, the button stopped working :( See merge request !699
\| \| * \| \| \| \|	Fix spec.browse-milestone-issues	Douwe Maan	2015-05-27	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add Browse Issues button to Dashboard and Group milestones.	Douwe Maan	2015-05-27	4	-4/+10
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix milestone "Browse Issues" button.	Douwe Maan	2015-05-27	3	-3/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Set milestone on new issue when creating issue from index with milestone ↵	Douwe Maan	2015-05-27	7	-37/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	filter active.
\| * \| \| \| \| \|	Merge branch 'fix-disabled-project-snippet-feature' into 'master'	Douwe Maan	2015-05-27	4	-1/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project snippets button appearing when it is disabled There was a typo in 9bcd36396b9b that caused the project snippets option to be shown when it is disabled. Closes #1705 See merge request !720
\| \| * \| \| \| \| \|	Fix project snippets button appearing when it is disabled	Stan Hu	2015-05-27	4	-1/+15
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1705
* \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-05-27	3	-1/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| / / / \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Merge branch 'fix-safari-clone-url' into 'master'	Douwe Maan	2015-05-27	2	-1/+5
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix clone URL losing selection after a single click in Safari and Chrome ### What does this MR do? This MR deactivates the mouseup event in the `git clone` URL to prevent the text from being deselected after a single click. ### Why was this MR needed? In Safari and Chrome 43.0.2357.65 (42.0.2311.152 worked fine), the URL would lose selection after a single click. To reproduce: 1. Go to https://gitlab.com/gitlab-org/gitlab-ce 2. Click on the URL in the repository (HTTP is selected by default). 3. Click on the SSH button. 4. Click on the URL again. The URL selection should be selected automatically, but it is deselected immediately. It appears that 92544df changed the selection event from `click` to `focusin` to make copy & paste work in X11. This Stack Overflow article discusses the deselection issue in detail: http://stackoverflow.com/questions/3380458/looking-for-a-better-workaround-to-chrome-select-on-focus-bug ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9326 See merge request !698
\| \| * \| \| \|	Fix clone URL losing selection after a single click in Safari and Chrome	Stan Hu	2015-05-24	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #9326
\| * \| \| \| \|	Merge branch 'support-file-attachments-milestones' into 'master'	Douwe Maan	2015-05-27	2	-0/+2
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add file attachment support in Milestone description ### What does this MR do? This MR adds support for attaching files to Milestone descriptions. ### Why was this MR needed? Dropzone support should be in every Markdown area. It seems that this one was overlooked. ### What are the relevant issue numbers? Closes #1648 See merge request !712
\| \| * \| \| \|	Add file attachment support in Milestone description	Stan Hu	2015-05-25	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1648
* \| \| \| \| \|	Add missing CHANGELOG item	Dmitriy Zaporozhets	2015-05-27	1	-0/+1
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'profile-in-sidebar' into 'master'	Dmitriy Zaporozhets	2015-05-27	6	-25/+58
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move user avatar and logout button to sidebar Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2272 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !719
\| * \| \| \| \|	Move user avatar and logout button to sidebarprofile-in-sidebar	Dmitriy Zaporozhets	2015-05-27	6	-25/+58
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'nav-settings' into 'master'	Dmitriy Zaporozhets	2015-05-27	3	-2/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify navigation labels for Project Settings and Group Settings. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2337. See merge request !703
\| * \| \| \| \|	Clarify navigation labels for Project Settings and Group Settings.nav-settings	Douwe Maan	2015-05-25	3	-2/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'commit-graphs-by-email' into 'master'	Dmitriy Zaporozhets	2015-05-27	3	-10/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Group project contributions by both name and email. See https://twitter.com/Argorain/status/598751646143897600. We now group by both name and email, so that "Douwe Maan - douwe@gitlab.com", "Douwe Maan - me@douwe.me" and "Douwe M. - me@douwe.me" are all combined into one graph. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2328. See merge request !700
\| * \| \| \| \| \|	Update specs.commit-graphs-by-email	Douwe Maan	2015-05-25	1	-3/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Group project contributions by both name and email.	Douwe Maan	2015-05-25	2	-7/+14
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'emailsonpush-prefix' into 'master'	Dmitriy Zaporozhets	2015-05-27	2	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefix EmailsOnPush email subject with `[Git]`. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2112. See merge request !701
\| * \| \| \| \| \| \|	Prefix EmailsOnPush email subject with `[Git]`.emailsonpush-prefix	Douwe Maan	2015-05-25	2	-1/+3
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'point-to-gitlab-com' into 'master'	Dmitriy Zaporozhets	2015-05-27	1	-4/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Point people to the issue tracker on GitLab.com to prevent duplication. /cc @jeroenvanbaarsen See merge request !713
\| * \| \| \| \| \| \|	Point people to the issue tracker on GitLab.com to prevent duplication.point-to-gitlab-com	Sytse Sijbrandij	2015-05-26	1	-4/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'accepted-rejected-mrs' into 'master'	Dmitriy Zaporozhets	2015-05-27	18	-32/+56
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Accepted and Rejected tabs to MR lists. Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites. ![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png) ![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png) ![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png) Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201. See merge request !702
\| * \| \| \| \| \| \|	Update specs.accepted-rejected-mrs	Douwe Maan	2015-05-25	2	-6/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Accepted and Rejected tabs to MR lists.	Douwe Maan	2015-05-25	10	-13/+36
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Consistently refer to MRs as either Accepted or Rejected.	Douwe Maan	2015-05-25	7	-12/+13
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-to_reference' into 'master'	Dmitriy Zaporozhets	2015-05-27	54	-472/+866
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add to_reference method to referable models Now there is a single source of information for which attribute a model uses to be referenced, and its special character. See merge request !641
\| * \| \| \| \| \| \|	More SystemNoteService cleanuprs-to_reference	Robert Speicher	2015-05-26	3	-46/+22
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix ClosingIssueExtractor specs	Robert Speicher	2015-05-26	1	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make use of to_reference in more specs	Robert Speicher	2015-05-26	12	-73/+76
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add a note about the commented-out test in Markdown Feature	Robert Speicher	2015-05-26	1	-0/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Surround Project.reference_pattern in parenthesis inside other patterns	Robert Speicher	2015-05-26	4	-4/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make `cross_project_reference?` less magical	Robert Speicher	2015-05-26	1	-4/+3
\| \| \| \| \| \| \| \|