summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-183-6/+23
|\
| * Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-172-6/+12
| |\
| | * Add RTL support to markdown rendererEbrahim Byagowi2016-10-162-6/+12
| * | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+11
| |/
* | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-146-9/+177
|\ \ | |/
| * 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 remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0818-52/+566
|\ \ | |/
| * 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
| * | | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-062-0/+159
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-302-0/+159
| | |\ \
| | | * | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-272-0/+159
| * | | | Merge branch 'kradydal/gitlab-ce-20989-disable-all-for-non-project-members'Rémy Coutable2016-10-051-0/+9
| |\ \ \ \
| | * | | | Imrove grammarKatarzyna Kobierska2016-10-031-1/+1
| | * | | | Fix test, add author attribute to all testsKatarzyna Kobierska2016-10-031-0/+9
| | | |_|/ | | |/| |
| * | | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-051-0/+123
| |\ \ \ \
| | * | | | Refactor Gitlab::IdentifierYorick Peterse2016-10-051-0/+123
| * | | | | Merge branch 'fix/22225' into 'master' Sean McGivern2016-10-041-2/+22
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Skip wiki creation when GitHub project has wiki enabledDouglas Barbosa Alexandre2016-10-041-2/+22
| * | | | | Fixed banzai test failuresPhil Hughes2016-10-041-4/+4
| |/ / / /
* | | | | 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 branch 'rs-string-conversion-in-interpolation' into 'master' Rémy Coutable2016-10-031-1/+1
| |\ \ \ \
| | * | | | Enable Lint/StringConversionInInterpolation cop and autocorrect offensesrs-string-conversion-in-interpolationRobert Speicher2016-10-031-1/+1
| | |/ / /
| * | | | Merge branch '22466-task-list-fork' into 'master' Rémy Coutable2016-10-031-16/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove the task_list test since it is patched upstreamJared Deckard2016-09-301-16/+0
| | |/ /
| * | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-022-6/+6
| |\ \ \ | | |/ / | |/| |
| | * | Allow Member.add_user to handle access requestersRémy Coutable2016-09-282-6/+6
View Lorry Controller Status