summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0938-234/+657
|\
| * Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-091-0/+8
| |\
| | * added spinach for glabal labelsglobal_labelsValery Sizov2015-09-031-0/+8
| * | FogBugz project importJared Szechy2015-09-082-0/+104
| * | Merge branch 'annotate-models' into 'master'Dmitriy Zaporozhets2015-09-079-69/+95
| |\ \
| | * | Re-annotate modelsStan Hu2015-09-069-69/+95
| * | | Remove style attribute from textarea during ZenMode activationrs-dev-issue-2466Robert Speicher2015-09-041-0/+5
| |/ /
| * | add Content-Type header of raw image filepilsner2015-09-041-0/+14
| * | Add API method for get user by ID of an SSH keyArtem V. Navrotskiy2015-09-031-0/+39
| |/
| * Merge branch 'fix-raw-controller-disposition' into 'master'Dmitriy Zaporozhets2015-09-021-0/+23
| |\
| | * Remove the filename argument from Content-Disposition header to avoidStan Hu2015-09-021-0/+23
| * | Drone CI serviceKirilll Zaitsev2015-09-023-58/+169
| |/
| * Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0111-51/+6
| |\
| | * Make sure the `gfm` helper passes the required optionsRobert Speicher2015-08-311-1/+1
| | * Remove invalid spec for GitlabMarkdownHelperRobert Speicher2015-08-311-5/+0
| | * Reference filters no longer take a custom class context optionRobert Speicher2015-08-278-40/+0
| | * Restore the forwarded HTML options in link_to_gfmRobert Speicher2015-08-271-0/+10
| | * Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-272-17/+7
| * | Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan2015-09-011-0/+34
| |\ \
| | * | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-011-0/+34
| * | | Merge branch 'fix-branches-cache-after-merge' into 'master'Valery Sizov2015-09-012-1/+29
| |\ \ \ | | |/ / | |/| |
| | * | Expire cache when merge request source branch was removedfix-branches-cache-after-mergeDmitriy Zaporozhets2015-08-282-1/+29
| * | | Merge branch 'dont-notify-users-without-project-access' into 'master'Robert Speicher2015-08-301-2/+9
| |\ \ \
| | * | | Don't notify users without access to the project when they are (accidentally)...dont-notify-users-without-project-accessDouwe Maan2015-08-261-2/+9
| | |/ /
| * | | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2945-136/+2855
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-275-53/+100
| | |\ \ | | | |/ | | |/|
| | | * Re-add user_color_scheme helperRobert Speicher2015-08-261-23/+54
| | | * Fix two more failing specsRobert Speicher2015-08-251-3/+2
| | | * Fix failing specRobert Speicher2015-08-251-2/+2
| | | * Remove user_color_scheme_classRobert Speicher2015-08-252-25/+0
| | | * Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-252-3/+45
| * | | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-0/+22
* | | | Move helpers back to original directoryDmitriy Zaporozhets2015-09-0910-54/+15
* | | | Refactor CI testsDmitriy Zaporozhets2015-09-0956-122/+122
* | | | Merge CI factories and CI spec/support with GitLabDmitriy Zaporozhets2015-09-0928-186/+20
* | | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-262-1/+34
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'rs-re-enable-user-reference-spec' into 'master'Douwe Maan2015-08-251-1/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-specRobert Speicher2015-08-241-1/+0
| * | | Merge branch 'handle-smtp-input-errors' into 'master'Dmitriy Zaporozhets2015-08-251-0/+34
| |\ \ \ | | |/ / | |/| |
| | * | Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to ...Stan Hu2015-08-191-0/+34
* | | | Groundwork for merging CI into CEDouwe Maan2015-08-2582-2/+4937
|/ / /
* | | Fix Error 500 in API when accessing a group that has an avatarStan Hu2015-08-241-1/+2
* | | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-236-29/+61
* | | Create cross-reference for closing references on commits pushed to non-defaul...Maël Valais2015-08-221-23/+34
* | | Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-2228-28/+2613
|\ \ \
| * | | No HTML-only email pleaseDouwe Maan2015-08-214-97/+59
| * | | Block blocked users from replying to threads by email.reply-by-emailDouwe Maan2015-08-211-0/+10
| * | | Fix markdown specs again. Apparently development and test behave differently.Douwe Maan2015-08-201-2/+1
| * | | Fix markdown specs.Douwe Maan2015-08-201-0/+1
| * | | Add stub_reply_by_email_setting helper.Douwe Maan2015-08-203-8/+11
View Lorry Controller Status