summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
| * | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-131-0/+33
| * | Allow login_as helper to accept a User objectRobert Speicher2015-06-131-4/+20
| * | Add Profiles::PreferencesControllerRobert Speicher2015-06-133-5/+84
* | | Merge branch 'fix-post-receive-external-tracker' into 'master'Douwe Maan2015-06-152-0/+19
|\ \ \ | |_|/ |/| |
| * | Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-122-0/+19
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1416-74/+72
|\ \ \
| * | | Use `page.all` and `page.within` in specsrs-expect-syntax-specsRobert Speicher2015-06-134-20/+20
| * | | Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher2015-06-1313-48/+46
| * | | Change `foo.should_not` syntax to `expect(foo).not_to` in specsRobert Speicher2015-06-134-6/+6
| | |/ | |/|
* | | Merge pull request #9340 from jvanbaarsen/update-noteableDmitriy Zaporozhets2015-06-142-1/+5
|\ \ \ | |/ / |/| |
| * | Update noteable after a new note is addedJeroen van Baarsen2015-06-052-1/+5
* | | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-121-0/+1
|\ \ \ | |_|/ |/| |
| * | session_expire_seconds => session_expire_delaythemaze752015-06-101-1/+1
| * | Add session expiration delay configuration through UI applicationEric Maziade2015-06-051-0/+1
* | | Fix shoulda-matchers requireRobert Speicher2015-06-101-0/+1
* | | Memoize result of JSON.parse in json_responseRobert Speicher2015-06-101-1/+1
* | | Add spec/support files for WebMock and test coverageRobert Speicher2015-06-103-12/+12
* | | "expect { }.not_to raise_error" no longer takes a specific classRobert Speicher2015-06-101-6/+2
* | | ensure_length_of -> validate_length_ofRobert Speicher2015-06-106-11/+11
* | | Correctly remove already-mentioned commits for cross referencesrs-issue-1778Robert Speicher2015-06-081-2/+19
* | | Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'Douwe Maan2015-06-051-12/+154
|\ \ \
View Lorry Controller Status