summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Prevent wrong markdown on issue ids when project has Jira service activatedissue_828Felipe Artur2016-10-192-26/+63
* Merge branch 'backport-git-access-spec-changes' into 'master' Douwe Maan2016-10-191-6/+6
|\
| * Backport git access spec changes from EEbackport-git-access-spec-changesSean McGivern2016-10-181-6/+6
* | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-192-2/+110
|\ \
| * \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-0/+1
| |\ \
| * | | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-181-0/+46
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-0/+11
| |\ \ \ | | | |/ | | |/|
| * | | Fix specsKamil Trzcinski2016-10-172-2/+2
| * | | Add specs to test on_stop and action on environmentsKamil Trzcinski2016-10-171-2/+2
| * | | Improve after code reviewKamil Trzcinski2016-10-171-0/+62
* | | | Merge branch '22782-external-link-filter-with-non-lowercase-scheme' into 'mas...Sean McGivern2016-10-181-0/+34
|\ \ \ \
| * | | | Add Nofollow for uppercased scheme in external urlthe-undefined2016-10-181-0/+34
| | |/ / | |/| |
* | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-182-1/+42
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-183-6/+23
| |\ \ \ | | |/ /
| * | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-146-9/+177
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0818-52/+566
| |\ \ \ \
| * | | | | Add pipeline_email_service. Fixes:Lin Jen-Shin2016-10-041-1/+2
| * | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0420-52/+878
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2113-51/+641
| |\ \ \ \ \ \
| * | | | | | | Make various trace methods take last_lines argument:Lin Jen-Shin2016-09-211-0/+40
* | | | | | | | Merge branch 'master' into issue_19734_2Phil Hughes2016-10-181-0/+11
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-172-6/+12
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Add visibility level to project repositoryissue_19734_2Felipe Artur2016-10-171-0/+1
| |/ / / / / |/| | | | |
* | | | | | Add RTL support to markdown rendererEbrahim Byagowi2016-10-162-6/+12
|/ / / / /
* | | | | Merge branch '22591-Convert-UTF-8-Emoji-to-Gitlab-emoji' into 'master' Rémy Coutable2016-10-131-1/+84
|\ \ \ \ \
| * | | | | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-131-0/+16
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-cehenrik2016-10-122-5/+90
| |\ \ \ \ \
| * | | | | | Convert unicode emojis to images.henrik2016-10-111-2/+69
* | | | | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-131-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add Project#boards to import/export configuration fileDouglas Barbosa Alexandre2016-10-111-1/+1
| |/ / / / /
* | | | | | Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan2016-10-121-4/+4
|\ \ \ \ \ \
| * | | | | | refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-mergedtiagonbotelho2016-10-111-4/+4
* | | | | | | Merge branch 'atom-routes' into 'master' Robert Speicher2016-10-111-1/+86
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Allow browsing branches that end with '.atom'Sean McGivern2016-10-111-1/+86
| | |_|_|_|/ | |/| | | |
* | | | | | HTMLEntityFilter -> HtmlEntityFilterNick Thomas2016-10-101-1/+1
| |/ / / / |/| | | |
* | | | | Use Hash rocket syntax to maintain Ruby 2.1 compatibility in specStan Hu2016-10-081-1/+1
|/ / / /
* | | | Merge branch 'memoize_shell_secret_token' into 'master' Rémy Coutable2016-10-071-3/+6
|\ \ \ \
| * | | | Call ensure_secret_token! in secret token test's before block since it would ...Justin DiPierro2016-10-061-0/+1
| * | | | Load Github::Shell's secret token from file on initialization instead of ever...Justin DiPierro2016-10-061-3/+5
* | | | | Enable CacheMarkdownField for the remaining modelsNick Thomas2016-10-071-0/+14
* | | | | Use CacheMarkdownField for notesNick Thomas2016-10-072-41/+24
* | | | | Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-072-1/+76
* | | | | Merge branch 'fix-already-selected-activity-link' into 'master' Fatih Acet2016-10-061-0/+49
|\ \ \ \ \
| * | | | | Fix inconsistent highlighting of already selected activity nav-linksClement Ho2016-10-051-0/+49
* | | | | | Make user constrainer lookup same as controller and add more constrainer testsDmitriy Zaporozhets2016-10-063-1/+20
* | | | | | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-061-0/+26
| |/ / / / |/| | | |
* | | | | Use higher size on Gitlab::Redis connection pool on Sidekiq serversPaco Guzman2016-10-061-0/+34
* | | | | Merge branch 'feature/improve-async-pipeline-processing' into 'master' Kamil Trzciński2016-10-061-1/+1
|\ \ \ \ \
| * | | | | Fix pipeline fixtures and calls to removed methodGrzegorz Bizon2016-10-041-1/+1