summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Gitlab::OAuth::User specrs-rspec3Robert Speicher2015-06-221-37/+48
* Add sleep call before yield in allowing_for_delayRobert Speicher2015-06-221-0/+2
* Change `to_not` calls to `not_to`Robert Speicher2015-06-2213-25/+25
* Fix `raise_error` without an argument deprecation warningsRobert Speicher2015-06-228-16/+16
* Remove junk from db_cleaner spec support fileRobert Speicher2015-06-221-29/+0
* Move CapybaraHelpers to its own support fileRobert Speicher2015-06-222-33/+32
* Bump pg gem to 0.18.2Robert Speicher2015-06-221-1/+1
* Bump database_cleaner to ~> 1.4.0Robert Speicher2015-06-222-6/+3
* Fix GitPushService specRobert Speicher2015-06-221-4/+6
* Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-229-21/+16
* Use to_reference for issue and merge request mentionable specsRobert Speicher2015-06-222-4/+4
* Bump rspec to 3.3.0Robert Speicher2015-06-222-30/+33
* Update spec/features/security specsRobert Speicher2015-06-222-43/+26
* Update email_spec gemRobert Speicher2015-06-224-5/+5
* Update mock and stub syntax for specsRobert Speicher2015-06-2249-220/+283
* Update and simplify Import controller specsRobert Speicher2015-06-226-36/+75
* Fix include_module matcherRobert Speicher2015-06-221-1/+5
* Bump poltergeist to 1.6.0Robert Speicher2015-06-222-4/+6
* Fix features syntaxRobert Speicher2015-06-2213-52/+84
* Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-222-3/+3
* Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-224-15/+18
* 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
View Lorry Controller Status