summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets2015-06-221-37/+0
|\
| * Remove overridden `link_to` helperrs-remove-link-to-overrideRobert Speicher2015-06-171-37/+0
* | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-225-15/+242
|\ \
| * | Add MergeRequestTabs specsrs-dev-issue-2355Robert Speicher2015-06-212-0/+104
| * | Fix timezone-based time_ago_with_tooltip spec failuresRobert Speicher2015-06-191-4/+5
| * | Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-15/+64
| * | Move Projects::MergeRequestsController spec to its correct locationRobert Speicher2015-06-171-0/+0
| * | Spec and refactor User.find_for_commitRobert Speicher2015-06-171-0/+25
| * | Update time_ago_with_tooltip helperRobert Speicher2015-06-171-0/+48
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-227-9/+217
|\ \
| * \ Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan2015-06-201-0/+5
| |\ \
| | * | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-191-0/+5
| * | | Merge branch 'rs-blobview-js-refactor' into 'master'Robert Speicher2015-06-192-0/+159
| |\ \ \
| | * | | Refactor LineHighlighterrs-blobview-js-refactorRobert Speicher2015-06-191-41/+22
| | * | | Rename BlobView to LineHighlighterRobert Speicher2015-06-192-9/+9
| | * | | Refactor and spec BlobView JSRobert Speicher2015-06-192-0/+178
| | |/ /
| * | | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-191-4/+4
| * | | Add 2FA status to Admin::Users#showRobert Speicher2015-06-191-4/+24
| * | | Add convenience methods to User for getting and setting 2FA statusRobert Speicher2015-06-192-1/+25
| |/ /
* | | Merge branch 'snippet_optional_filename' into 'master'Douwe Maan2015-06-201-1/+0
|\ \ \ | |/ / |/| |
| * | Make snippet filename optional.Nicolas2015-06-201-1/+0
* | | Add init test for ProjectSearchResultsStan Hu2015-06-181-0/+23
* | | Merge branch 'fix-labels-permisssion-check' into 'master'Douwe Maan2015-06-181-0/+40
|\ \ \
| * | | Fix 403 Access Denied error messages when accessing Labels section in a proje...Stan Hu2015-06-181-0/+40
* | | | Fix behavior of ldap_person method in Gitlab::OAuth::UserAlex Lossent2015-06-171-46/+56
| |_|/ |/| |
* | | Fix duplicate 'Email has already been taken' message when creating a userswellard2015-06-161-0/+21
|/ /
* | Merge branch 'fix-ext-issue-webbased-hooks' into 'master'Douwe Maan2015-06-161-0/+9
|\ \
| * | Fix hooks for web based events with external issue referencesDaniel Gerhardt2015-06-141-0/+9
* | | Look for .gitlab-ci.yml only if checkout_sha is presentfix-gitlab-ci-ymlDmitriy Zaporozhets2015-06-151-1/+1
* | | Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-1511-35/+404
|\ \ \
| * | | Add `allowing_for_delay` helper method for feature specsRobert Speicher2015-06-142-6/+41
| * | | Refactor dashboard_choicesRobert Speicher2015-06-131-8/+10
| * | | Spec the failure cases for PreferencesController#updateRobert Speicher2015-06-131-2/+18
| * | | Make the dashboard choice text match the text in the sidebarRobert Speicher2015-06-131-2/+2
| * | | Add feature specs for default dashboard preferenceRobert Speicher2015-06-131-9/+48
| * | | Add a form field to customize the dashboard preferenceRobert Speicher2015-06-131-0/+17
| * | | Add RootControllerRobert Speicher2015-06-132-2/+40
| * | | Add `dashboard` attribute to User modelRobert Speicher2015-06-132-1/+4
| * | | Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-131-0/+8
| * | | Add PreferencesHelper moduleRobert Speicher2015-06-132-21/+53
| * | | Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-133-5/+56
View Lorry Controller Status