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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 '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	2	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+2
\| \| \|
* \| \|	Merge branch 'commit-graphs-by-email' into 'master'	Dmitriy Zaporozhets	2015-05-27	1	-7/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Group project contributions by both name and email.	Douwe Maan	2015-05-25	1	-7/+13
\| \| \| \|
* \| \| \|	Merge branch 'emailsonpush-prefix' into 'master'	Dmitriy Zaporozhets	2015-05-27	1	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+2
\| \|/ / /
* \| \| \|	Merge branch 'accepted-rejected-mrs' into 'master'	Dmitriy Zaporozhets	2015-05-27	15	-25/+47
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Add Accepted and Rejected tabs to MR lists.	Douwe Maan	2015-05-25	9	-13/+35
\| \| \| \|
\| * \| \|	Consistently refer to MRs as either Accepted or Rejected.	Douwe Maan	2015-05-25	6	-12/+12
\| \|/ /
* \| \|	Merge branch 'rs-to_reference' into 'master'	Dmitriy Zaporozhets	2015-05-27	16	-85/+347
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \|
\| * \| \|	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
\| \| \| \|
\| * \| \|	Support only double quotes for multi-word label references	Robert Speicher	2015-05-26	1	-6/+4
\| \| \| \|
\| * \| \|	Fix for Snippets with a project	Robert Speicher	2015-05-26	1	-1/+1
\| \| \| \|
\| * \| \|	Minor documentation updates	Robert Speicher	2015-05-26	2	-2/+2
\| \| \| \|
\| * \| \|	Add `reference_pattern` to Referable models	Robert Speicher	2015-05-26	11	-9/+114
\| \| \| \|
\| * \| \|	Update CommitRange#to_reference to use full SHAs	Robert Speicher	2015-05-26	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We only want them shortened by the filter, which calls to_s
\| * \| \|	Implement gfm_reference directly in Mentionable	Robert Speicher	2015-05-26	4	-19/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Except for Note, which still overrides it.
\| * \| \|	Simplify `cross_project_reference` with `to_reference`	Robert Speicher	2015-05-26	1	-7/+17
\| \| \| \|
\| * \| \|	Minor model spec cleanups	Robert Speicher	2015-05-26	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Snippet model was missing project association
\| * \| \|	Add `to_reference` for models that support references	Robert Speicher	2015-05-26	10	-16/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now there is a single source of information for which attribute a model uses to be referenced, and its special character.
\| * \| \|	Add Referable concern	Robert Speicher	2015-05-26	1	-0/+52
\| \| \| \|
\| * \| \|	Add Commit#==	Robert Speicher	2015-05-26	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior, comparison would use the Ruby object's ID, which got out of sync after a Spring fork and would result in erroneous test failures. Now we just check that the compared object is a Commit and then compare their underlying raw commit objects.
* \| \| \|	Merge branch 'rs-manual-2fa-entry' into 'master'	Dmitriy Zaporozhets	2015-05-27	3	-3/+34
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for manually entering 2FA details > ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png) Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone. See merge request !694
\| * \| \| \|	Bump secret key length to 32rs-manual-2fa-entry	Robert Speicher	2015-05-23	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add support for manually entering 2FA details	Robert Speicher	2015-05-23	3	-3/+34
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-title-change-note' into 'master'	Douwe Maan	2015-05-27	4	-0/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a note when an Issue or Merge Request's title changes > ![Screen_Shot_2015-05-26_at_9.40.19_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f05c6a7b9f489ce66560cfe724184ec9/Screen_Shot_2015-05-26_at_9.40.19_PM.png) Closes #1434 See merge request !717
\| * \| \| \| \|	Add a note when an Issue or Merge Request's title changes	Robert Speicher	2015-05-26	4	-0/+32
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'fix-hipchat-default-api-version' into 'master'	Douwe Maan	2015-05-27	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow HipChat API version to be blank and default to v2 ### What does this MR do? This MR fixes a regression introduced in v7.11 that requires a HipChat API version to be specified when it is supposed to be optional. ### Why was this MR needed? The "optional" HipChat API version in 57c724558 passed in a blank `api_version` when nothing was specified, and the code was not tested. This would cause a 500 Error. ### What are the relevant issue numbers? Closes #772 See merge request !718
\| * \| \| \| \|	Allow HipChat API version to be blank and default to v2	Stan Hu	2015-05-26	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #772
* \| \| \| \|	Merge branch 'fix-typo-in-email' into 'master'	Robert Speicher	2015-05-26	2	-4/+4
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Asignee" typo in new issue/merge request emails See merge request !676
\| * \| \| \|	email: fix typo	Ben Boeckel	2015-05-18	2	-4/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'milestoneRescue' into 'master'	Robert Schilling	2015-05-26	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change percent_complete rescue value from 100 to 0 The percent_complete method returns a value of 100 when a ZeroDivisionError occurs. That seems like a very strange default for an error case, and results in a bug when a milestone has no corresponding issues (new, empty milestones show 100% completion). This commit changes the rescue value to 0, and subsequently fixes #1656, which reported this problem. See merge request !714
\| * \| \| \| \|	Change percent_complete rescue value from 100 to 0	Jonah Bishop	2015-05-26	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The percent_complete method returns a value of 100 when a ZeroDivisionError occurs. That seems like a very strange default for an error case, and results in a bug when a milestone has no corresponding issues (new, empty milestones show 100% completion). This commit changes the rescue value to 0, and subsequently fixes #1656, which reported this problem.
* \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-05-26	2	-5/+15
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creation	Jeroen van Baarsen	2015-05-26	2	-5/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate wiki page creation
\| \| * \| \| \| \| \|	Validate wiki page creation	Jeroen van Baarsen	2015-05-26	2	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	What does this do? It adds validation to the creation of a wiki page, that way the user gets real feedback instead of just a 404 page if the name of the wiki page was invalid Why is this needed? There are a lot of characters that are not allowed in the creation of a wiki page, there is even a small text that is saying: Please don't use spaces. Although we have that text there, we don't actually validate on this. This commit adds validation on the title and gives the user actual feedback. What issues does this fix? Fixes http://github.com/gitlabhq/gitlabhq/issues/5357 Fixes https://github.com/gitlabhq/gitlabhq/issues/8565 Fixes https://github.com/gitlabhq/gitlabhq/issues/3913 Fixes https://github.com/gitlabhq/gitlabhq/issues/8166 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2015-05-26	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'fix-escape-key-in-zen-mode' into 'master'	Robert Schilling	2015-05-26	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Zen Mode not closing with ESC key ### What does this MR do? This MR fixes the ESC key not leaving Zen Mode (fullscreen). ### Why was this MR needed? This has been broken since GitLab v7.8. The `change` event for `zen-toggle-comment` was never fired. See: http://stackoverflow.com/questions/19505011/checkbox-checked-with-prop-does-not-fire-events-attached-to-change?answertab=votes#tab-top ### What are the relevant issue numbers? * Closes #1025 * Closes https://github.com/gitlabhq/gitlabhq/issues/9018 See merge request !710
\| \| * \| \| \| \| \| \|	Fix Zen Mode not closing with ESC key	Stan Hu	2015-05-25	1	-2/+2
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1025
* \| \| \| \| \| \| \|	Use default control for search field in header	Dmitriy Zaporozhets	2015-05-26	2	-13/+1
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-26	7	-31/+46
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| / / / / \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'rs-link_to_label' into 'master'	Dmitriy Zaporozhets	2015-05-26	6	-10/+44
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link_to_label helper The primary purpose of this change was to make the actual labels on `Labels#index` clickable. See merge request !690
\| \| * \| \| \| \|	Make the actual labels on Labels#index linksrs-link_to_label	Robert Speicher	2015-05-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now the user can click the labels themselves or the "X open issues" text.
\| \| * \| \| \| \|	Add link_to_label helper	Robert Speicher	2015-05-21	6	-9/+43
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix-fullscreen-preview-in-milestones' into 'master'	Dmitriy Zaporozhets	2015-05-26	1	-21/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Markdown preview not working in Edit Milestone page ### What does this MR do? This MR removes the automatic Zen Mode URL update when a hash is present and makes Markdown preview work again in the Edit Milestone page. I think the intent was to make it possible to link to a full-screen edit with a URL (e.g. http://foo/bar/issues/1/edit#fullscreen), but I don't this has ever worked. Perhaps a future MR can support this. ### Why was this MR needed? A JavaScript error would be seen in the Milestone Edit page: ```javascript Uncaught error, unrecognized expression: $('.zennable input[type=checkbox]##md-preview-holder') ``` In the Milestone Edit page, apparently the use of the hash `#md-preview-holder` causes the Zen Mode JavaScript to attempt to parse the hash for the `fullscreen_` prefix and look up the checkbox based on a unknown ID. ### Are there points in the code the reviewer needs to double check? If we want to keep this hash update, an alternative fix is to add an `if` check in the beginning of `checkboxFromLocationHash`: ```coffeescript if (window.location.hash.indexOf('#' + ZenMode.fullscreen_prefix) == -1) return null ``` ### What are the relevant issue numbers? * Closes #1687 * Closes https://github.com/gitlabhq/gitlabhq/issues/9325 See merge request !711