summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ok, that was useless, let's try this!rs-rspec3-debugRobert Speicher2015-06-181-1/+7
* WEEEEEEEERobert Speicher2015-06-182-4/+12
* More debuggingRobert Speicher2015-06-182-2/+2
* Add poltergeist and phantomjs debuggingRobert Speicher2015-06-181-1/+1
* Change `to_not` calls to `not_to`Robert Speicher2015-06-1713-25/+25
* Fix `raise_error` without an argument deprecation warningsRobert Speicher2015-06-178-16/+16
* Remove junk from db_cleaner spec support fileRobert Speicher2015-06-171-29/+0
* Move CapybaraHelpers to its own support fileRobert Speicher2015-06-172-33/+32
* Bump pg gem to 0.18.2Robert Speicher2015-06-171-1/+1
* Bump database_cleaner to ~> 1.4.0Robert Speicher2015-06-172-6/+3
* Fix GitPushService specsRobert Speicher2015-06-172-7/+10
* Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-179-21/+16
* Use to_reference for issue and merge request mentionable specsRobert Speicher2015-06-172-4/+4
* Bump rspec to 3.3.0Robert Speicher2015-06-172-27/+30
* Fix OAuth::User specRobert Speicher2015-06-171-25/+41
* Update spec/features/security specsRobert Speicher2015-06-172-43/+26
* Update email_spec gemRobert Speicher2015-06-174-5/+5
* Update mock and stub syntax for specsRobert Speicher2015-06-1749-220/+283
* Update and simplify Import controller specsRobert Speicher2015-06-176-36/+75
* Fix include_module matcherRobert Speicher2015-06-171-1/+5
* Fix features syntaxJeroen van Baarsen2015-06-1716-57/+91
* Remove the "multiselect blob" featuresJeroen van Baarsen2015-06-172-143/+0
* Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-172-3/+3
* Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-174-15/+18
* Merge branch 'link-to-rc-packages-in-tweet' into 'master'Sytse Sijbrandij2015-06-171-2/+4
|\
| * Add 'proposed tweet' for RC1link-to-rc-packages-in-tweetJacob Vosmaer2015-06-171-2/+4
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-173-2/+29
|\
| * Merge branch 'swellard-issue-6123' into 'master'Dmitriy Zaporozhets2015-06-172-1/+24
| |\
| | * Fix duplicate 'Email has already been taken' message when creating a user, up...swellard2015-06-161-1/+1
| | * Fix duplicate 'Email has already been taken' message when creating a userswellard2015-06-162-1/+24
| * | Merge branch 'rs-dev-issue-2373' into 'master'Dmitriy Zaporozhets2015-06-171-1/+5
| |\ \
| | * | Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')rs-dev-issue-2373Robert Speicher2015-06-161-1/+5
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-06-171-0/+3
|\ \ \ \
| * \ \ \ Merge branch 'from_own_instance' into 'master'Job van der Voort2015-06-171-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | added info about migrating to gitlab.comKaren Carias2015-06-171-0/+3
* | | | | Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-173-27/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-163-24/+8
| | |/ / | |/| |
* | | | Merge branch 'rs-rails-update' into 'master'Dmitriy Zaporozhets2015-06-172-34/+37
|\ \ \ \
| * | | | Bump jquery-rails gem versionrs-rails-updateRobert Speicher2015-06-162-3/+3
| * | | | Bump rails to 4.1.11, and make the version requirement exactRobert Speicher2015-06-162-31/+34
|/ / / /
* | | | Merge branch 'rs-bootlint-fixes' into 'master'Robert Speicher2015-06-1620-29/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | Bootlint: Fix incorrectly nested `form-group` elementRobert Speicher2015-06-161-2/+2
| * | | Bootlint: Add missing `type` attribute for buttonsRobert Speicher2015-06-162-1/+3
| * | | Bootlint: Modals no longer need a '.hide' classRobert Speicher2015-06-168-8/+8
| * | | Bootlint: Use offset grid classes instead of empty divsRobert Speicher2015-06-1610-18/+10
|/ / /
* | | Merge branch 'support-comment-parallel-diff' into 'master'Douwe Maan2015-06-1612-44/+139
|\ \ \ | |_|/ |/| |
| * | Support commenting on a diff in side-by-side viewStan Hu2015-06-1612-44/+139
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-161-0/+8
|\ \ \
| * \ \ Merge branch 'require_kerberos_when_enabled' into 'master'Dmitriy Zaporozhets2015-06-161-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | Use explicit if.Marin Jankovski2015-06-161-2/+3
View Lorry Controller Status