summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Style/NonNilCheck cop violationsrubocop-for-testsStan Hu2015-06-221-1/+1
* Fix Style/IndentationWidth cop violationsStan Hu2015-06-224-8/+8
* Fix Style/CaseIndentation cop violationsStan Hu2015-06-221-10/+10
* Fix Style/AlignHash cop violationsStan Hu2015-06-2215-80/+178
* Fix bad multi-line split from previous commitRobert Speicher2015-06-221-1/+2
* Fix Style/Blocks cop violationsRobert Speicher2015-06-2234-213/+197
* Fix Style/CommentIndentation cop violationRobert Speicher2015-06-221-7/+7
* Fix Style/HashSyntax violationsRobert Speicher2015-06-223-3/+3
* Fix Style/Not cop violationsRobert Speicher2015-06-221-2/+2
* Fix Style/AsciiComments cop violationRobert Speicher2015-06-221-1/+1
* Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher2015-06-2218-45/+45
* Fix Style/TrailingBlankLines cop violationsRobert Speicher2015-06-2212-26/+1
* Fix Style/IndentationConsistency cop violationsRobert Speicher2015-06-223-7/+5
* Fix part of api specs for rubocopDmitriy Zaporozhets2015-06-224-84/+84
* Remove unnecessary whitespace between let and (Dmitriy Zaporozhets2015-06-227-19/+19
* Fix rubocop issues at feature/ directoryDmitriy Zaporozhets2015-06-229-37/+35
* Enable rubocop for tests tooDmitriy Zaporozhets2015-06-221-2/+0
* Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets2015-06-222-70/+0
|\
| * Remove overridden `link_to` helperrs-remove-link-to-overrideRobert Speicher2015-06-172-70/+0
* | Merge branch 'new-logo' into 'master'Dmitriy Zaporozhets2015-06-2213-3/+85
|\ \
| * | Replace old logo with new onenew-logoDmitriy Zaporozhets2015-06-1913-3/+85
* | | Merge branch 'web-editor-autocrlf' into 'master'Dmitriy Zaporozhets2015-06-224-4/+10
|\ \ \
| * | | Bump gitlab_git to 7.2.5Jacob Vosmaer2015-06-222-3/+3
| * | | Convert CRLF newlines to LF when committing using the web editor.web-editor-autocrlfDouwe Maan2015-06-202-1/+7
* | | | Merge branch 'change_log_update' into 'master'Jacob Vosmaer2015-06-221-1/+1
|\ \ \ \
| * | | | changelog fixchange_log_updateValery Sizov2015-06-221-1/+1
| |/ / /
* | | | Merge branch 'restore_uploads_fix' into 'master'Dmitriy Zaporozhets2015-06-221-1/+1
|\ \ \ \
| * | | | Avoid "cannot copy directory to itself" restore errorBryan Stearns2014-08-031-1/+1
* | | | | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-2221-134/+470
|\ \ \ \ \
| * | | | | Add MergeRequestTabs specsrs-dev-issue-2355Robert Speicher2015-06-213-44/+193
| * | | | | Minor style fixes in MergeRequestTabsRobert Speicher2015-06-211-2/+2
| * | | | | Fix timezone-based time_ago_with_tooltip spec failuresRobert Speicher2015-06-191-4/+5
| * | | | | Use `skip_js` for commit timestampsRobert Speicher2015-06-171-1/+1
| * | | | | Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-173-18/+70
| * | | | | Extract MergeRequest tab behavior to its own JS classRobert Speicher2015-06-172-88/+115
| * | | | | Move Projects::MergeRequestsController spec to its correct locationRobert Speicher2015-06-171-0/+0
| * | | | | Spec and refactor User.find_for_commitRobert Speicher2015-06-172-4/+45
| * | | | | Remove duplicate `timeago` callRobert Speicher2015-06-171-2/+1
| * | | | | Update time_ago_with_tooltip helperRobert Speicher2015-06-1710-21/+88
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-2227-251/+482
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'new-mr-disable-change-target-branch' into 'master'Douwe Maan2015-06-202-6/+8
| |\ \ \ \
| | * | | | Disable changing of target branch in new merge request page when a branch has...Stan Hu2015-06-192-6/+8
| | | |_|/ | | |/| |
| * | | | Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan2015-06-206-2/+43
| |\ \ \ \
| | * | | | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-196-2/+43
| | |/ / /
| * | | | Merge branch 'sshdoc' into 'master'Achilleas Pipinellis2015-06-201-1/+29
| |\ \ \ \
| | * | | | Show username SSH config exampleJeff Blaine2015-06-191-3/+5
| | * | | | Include non-default ssh key location infoJeff Blaine2015-06-191-1/+27
| * | | | | Merge branch 'rs-blobview-js-refactor' into 'master'Robert Speicher2015-06-198-220/+311
| |\ \ \ \ \
| | * | | | | Minor style fixes for LineHighlighterRobert Speicher2015-06-191-3/+3
| | * | | | | Refactor LineHighlighterrs-blobview-js-refactorRobert Speicher2015-06-192-82/+51