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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Validate presence of provider field in Identityidentity-validation	Dmitriy Zaporozhets	2015-06-23	1	-0/+1
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'animation-sidebar' into 'master'	Dmitriy Zaporozhets	2015-06-23	4	-18/+38
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Animation of Sidebar (video in here) Edited the CSS of header and sidebar; added a new div of gitlab-logo-container to the html to make things easier. The transition-duration is set to 0.3s and when the nav bar expands, it opens up over the text, essentially revealing hidden text. [animation-sidebar-2.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b15996a256d6bed03a19c68549d116e4/animation-sidebar-2.mov) /cc @JobV @nicolas2 See merge request !849
\| *	fixed the resizing icon issueanimation-sidebar	Darby	2015-06-22	1	-2/+2
\| \|
\| *	Edited the CSS of header and sidebar; added a new class of logo-container to ↵	Darby	2015-06-19	4	-16/+36
\| \| \| \| \| \| \| \|	the html to make things easier
* \|	Merge branch 'rs-dev-issue-2414' into 'master'	Dmitriy Zaporozhets	2015-06-23	2	-18/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow Admin to filter users by 2FA status > ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png) Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414 See merge request !852
\| * \|	Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414	Robert Speicher	2015-06-22	1	-14/+3
\| \| \|
\| * \|	Make default value for otp_required_for_login false instead of null	Robert Speicher	2015-06-20	1	-4/+4
\| \| \|
\| * \|	Allow Admin to filter users by 2FA status	Robert Speicher	2015-06-19	2	-4/+21
\| \| \|
* \| \|	Merge branch 'revert-mr-state-names'	Dmitriy Zaporozhets	2015-06-22	11	-35/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
\| * \| \|	Fix closed merge request scope at milestone page	Dmitriy Zaporozhets	2015-06-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Revert merge request states renaming	Dmitriy Zaporozhets	2015-06-19	11	-34/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'see-full-size-avatar' into 'master'	Dmitriy Zaporozhets	2015-06-22	1	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link an users avatar to the fullsize version When we want to see the fullsize avatar of a user we can click the avatar on the profile page and the fullsize version will be opened in a new window/tab. See merge request !415
\| * \| \| \|	When we want to see the fullsize avatar of a user we can click the avatar on ↵	Sander Boom	2015-03-21	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the profile page and the fullsize version will be opened in a new window/tab.
* \| \| \| \|	Merge branch 'remove_unused_except' into 'master'	Dmitriy Zaporozhets	2015-06-22	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	projects doesn't seem to be a valid action in this controller Hi, This is just a tiny change. Let me know if I'm doing it wrong... Eaden See merge request !696
\| * \| \| \| \|	projects doesn't seem to be a valid action in this controller	Eaden	2015-05-16	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-rspec3' into 'master'	Dmitriy Zaporozhets	2015-06-22	8	-13/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RSpec3 Upgrades rspec to 3.3.0, we're now up-to-date! :tada: See merge request !831
\| * \| \| \| \| \|	Replace remaining references to `Note.create_cross_reference_note`	Robert Speicher	2015-06-22	5	-9/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update mock and stub syntax for specs	Robert Speicher	2015-06-22	3	-4/+15
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-remove-link-to-override'	Dmitriy Zaporozhets	2015-06-22	1	-33/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/helpers/application_helper_spec.rb
\| * \| \| \| \| \| \|	Remove overridden `link_to` helperrs-remove-link-to-override	Robert Speicher	2015-06-17	1	-33/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The purpose for this override is now handled by `ExternalLinkFilter`.
* \| \| \| \| \| \| \|	Merge branch 'new-logo' into 'master'	Dmitriy Zaporozhets	2015-06-22	7	-2/+58
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace old logo with new one Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @JobV @sytses See merge request !848
\| * \| \| \| \| \| \|	Replace old logo with new onenew-logo	Dmitriy Zaporozhets	2015-06-19	7	-2/+58
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'web-editor-autocrlf' into 'master'	Dmitriy Zaporozhets	2015-06-22	1	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Convert CRLF newlines to LF when committing using the web editor. Fixes #1823 and https://github.com/gitlabhq/gitlabhq/issues/7950. Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/29 being merged and a new gitlab_git being released. cc @jacobvosmaer See merge request !858
\| * \| \| \| \| \| \|	Convert CRLF newlines to LF when committing using the web editor.web-editor-autocrlf	Douwe Maan	2015-06-20	1	-1/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rs-dev-issue-2355' into 'master'	Dmitriy Zaporozhets	2015-06-22	16	-119/+228
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MergeRequest#show performance improvements This is a first pass on improving the performance of the `MergeRequests#show` page. Notable changes: - The "Commits" tab is loaded lazily, so the initial page load should be much faster for MRs with many commits. - Relative timestamps via `timeago` are only initialized once per load instead of `O(n^2)`. This greatly improves frontend rendering times for a large number of commits. - Refactored `User.find_for_commit` to use a single ARel-generated SQL query instead of the old method which resulted in one query, and could result in up to three. See merge request !838
\| * \| \| \| \| \| \| \|	Add MergeRequestTabs specsrs-dev-issue-2355	Robert Speicher	2015-06-21	1	-44/+89
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Minor style fixes in MergeRequestTabs	Robert Speicher	2015-06-21	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use `skip_js` for commit timestamps	Robert Speicher	2015-06-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This greatly improves frontend rendering times.
\| * \| \| \| \| \| \| \|	Load the Merge Request > Commits tab lazily	Robert Speicher	2015-06-17	2	-3/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Extract MergeRequest tab behavior to its own JS class	Robert Speicher	2015-06-17	2	-88/+115
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Spec and refactor User.find_for_commit	Robert Speicher	2015-06-17	1	-4/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now it executes a single query instead of a possible three at the cost of some scary-looking ARel calls.
\| * \| \| \| \| \| \| \|	Remove duplicate `timeago` call	Robert Speicher	2015-06-17	1	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update time_ago_with_tooltip helper	Robert Speicher	2015-06-17	9	-21/+40
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor refactoring, add specs, changes arguments to use keywords.
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-22	12	-93/+188
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'new-mr-disable-change-target-branch' into 'master'	Douwe Maan	2015-06-20	1	-6/+7
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable changing of target branch in new merge request page when a branch has already been specified ### What does this MR do? This MR prevents a user from changing the target branch inside a new merge request page if the target branch has already been specified (e.g. from the shortcut in the activity feed). A link to "Change branches" is provided to allow the user to do this properly. ### Why was this MR needed? If a user attempted to create a merge request from a shortcut with a pre-specified target branch (e.g. `master`), the dropdown would suggest that the user could change the branch. However, this did not actually work due to duplicate data elements (see #1830 for more details), and the target branch would always be set to the original, default branch. This would lead to confusion, potentially causing an improper merge request to be created. ### What are the relevant issue numbers? Closes #1830 ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/eeec4f5d4b66625a14be41e5ecbdc016/image.png) See merge request !846
\| \| * \| \| \| \| \| \|	Disable changing of target branch in new merge request page when a branch ↵	Stan Hu	2015-06-19	1	-6/+7
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	has already been specified Closes #1830
\| * \| \| \| \| \| \|	Merge branch 'fix-error-500-internal-snippet' into 'master'	Douwe Maan	2015-06-20	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when one user attempts to access another's personal, internal snippet ### What does this MR do? This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce: ### Why was this MR needed? 1. Go to `<hostname>/snippets/new`. 2. Select "Internal". 3. Create a snippet. Save the URL (e.g. `<hostname>/snippets/20`) 4. Logout and sign in as another user. 5. Go to the URL in step 3. ### What are the relevant issue numbers? Closes #1815 See merge request !854
\| \| * \| \| \| \| \| \|	Fix Error 500 when one user attempts to access a personal, internal snippet	Stan Hu	2015-06-19	1	-1/+1
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1815
\| * \| \| \| \| \| \|	Merge branch 'rs-blobview-js-refactor' into 'master'	Robert Speicher	2015-06-19	4	-77/+152
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor and spec line highlighting Javascript - Replaces the fragile Spinach tests for this feature with Jasmine tests - The "Don't scroll the page when we click a line number" behavior now works as expected See merge request !820
\| \| * \| \| \| \| \|	Minor style fixes for LineHighlighter	Robert Speicher	2015-06-19	1	-3/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Refactor LineHighlighterrs-blobview-js-refactor	Robert Speicher	2015-06-19	1	-41/+29
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Rename BlobView to LineHighlighter	Robert Speicher	2015-06-19	2	-4/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Simplify line numbering	Robert Speicher	2015-06-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Use `pushState` instead of the temporary div hack	Robert Speicher	2015-06-19	1	-36/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Refactor and spec BlobView JS	Robert Speicher	2015-06-19	2	-74/+187
\| \| \|/ / / / /
\| * \| \| \| \| \|	Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415	Robert Speicher	2015-06-19	4	-5/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add 2FA status to Admin::Users#show	Robert Speicher	2015-06-19	1	-0/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add convenience methods to User for getting and setting 2FA status	Robert Speicher	2015-06-19	1	-0/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move the User dashboard enum further up in the class	Robert Speicher	2015-06-19	1	-4/+3
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'snippet_optional_filename' into 'master'	Douwe Maan	2015-06-20	2	-2/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make snippet filename optional. Fixes #2384. See merge request !1866