summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix an error where we were unable to create a CommitStatus for running statefix-commit-statusKamil Trzcinski2016-09-121-10/+29
* Merge branch 'fix-api-sorting' into 'master' Douwe Maan2016-09-121-6/+120
|\
| * Fix API issues sortingfix-api-sortingSean McGivern2016-09-091-6/+120
* | Merge branch '19359-api-for-notification-settings' into 'master' Rémy Coutable2016-09-121-0/+89
|\ \
| * | Add notification_settings API callsMarc Siegfriedt2016-09-091-0/+89
* | | Merge branch 'pipelines-finder-spec-fix' into 'master' Robert Speicher2016-09-101-2/+3
|\ \ \
| * | | Improve PipelinesFinder spec so that it does not depend on hard-coded databas...pipelines-finder-spec-fixStan Hu2016-09-091-2/+3
* | | | Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher2016-09-092-3/+115
|\ \ \ \
| * | | | Request only the LDAP attributes we needDrew Blessing2016-09-092-3/+115
| |/ / /
* | | | Merge branch 'add-remember-option-u2f' into 'master' Robert Speicher2016-09-093-1/+38
|\ \ \ \
| * | | | Pass the remember_me option into the u2f form and support it while authentica...add-remember-option-u2fDJ Mountney2016-09-013-1/+38
* | | | | Merge branch 'branches-mr-button-permissions' into 'master' Robert Speicher2016-09-091-17/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Hides merge request button on branches pagebranches-mr-button-permissionsPhil Hughes2016-09-021-17/+31
| |/ / /
* | | | Merge branch 'github-avoid-conflicts-with-admin-labels' into 'master' Rémy Coutable2016-09-092-9/+33
|\ \ \ \
| * | | | Avoid conflict with admin labels when importing GitHub labelsDouglas Barbosa Alexandre2016-09-092-9/+33
| | |_|/ | |/| |
* | | | Merge branch '20300-restore-comments' into 'master' Jacob Schatz2016-09-0913-66/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Require comments must be included before codeJared Deckard2016-09-081-5/+5
| * | | Restore comments lost when converting CoffeeScript to JavaScriptJared Deckard2016-09-0813-69/+48
* | | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-095-5/+134
|\ \ \ \
| * | | | Constants in specsJacob Vosmaer2016-09-062-2/+2
| * | | | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-055-5/+134
* | | | | Merge branch 'slash-commands-issuable-spec-fix' into 'master' Rémy Coutable2016-09-095-60/+44
|\ \ \ \ \
| * | | | | Move write_note into SlashCommandsHelper and update other dependent specsslash-commands-issuable-spec-fixStan Hu2016-09-084-21/+24
| * | | | | Wait for logout message in login_helpersStan Hu2016-09-081-0/+1
| * | | | | Use wait_for_ajax to avoid database deadlocks after specs are cleanedStan Hu2016-09-081-0/+7
| * | | | | Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rbStan Hu2016-09-081-48/+21
| | |_|_|/ | |/| | |
* | | | | Merge branch '21714-refresh-the-todos-count-cache-after-issuable-delete' into...Rémy Coutable2016-09-093-0/+28
|\ \ \ \ \
| * | | | | Refresh todos count cache when an Issue/MR is deletedDouglas Barbosa Alexandre2016-09-083-0/+28
| |/ / / /
* | | | | Merge branch 'sidekiq-ps-parsing' into 'master' Rémy Coutable2016-09-091-0/+40
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reformat Regexp Pascal Betz2016-09-081-0/+5
| * | | | Move parsing of sidekiq ps into helperPascal Betz2016-09-071-0/+35
* | | | | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-082-5/+145
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Sort by database, feedback:Lin Jen-Shin2016-09-061-1/+1
| * | | | Just use module because there's nothing to save, feedback:Lin Jen-Shin2016-09-061-4/+4
| * | | | Remove tests for pending_durationLin Jen-Shin2016-09-051-2/+1
| * | | | Just sum all the queuing time, indication for needing more runnersLin Jen-Shin2016-09-021-1/+1
| * | | | Make sure the algorithm did exclude gapsLin Jen-Shin2016-09-021-2/+2
| * | | | Actually we still need to use total - running to get:Lin Jen-Shin2016-09-021-6/+11
| * | | | Merge remote-tracking branch 'upstream/master' into smart-pipeline-durationLin Jen-Shin2016-09-0287-510/+2154
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Calculate real queueing time to exclude gaps from:Lin Jen-Shin2016-09-022-17/+18
| * | | | It's renamed to periodsLin Jen-Shin2016-08-311-2/+2
| * | | | Add test cases from:Lin Jen-Shin2016-08-301-0/+28
| * | | | Rename to periods since it's easier to understandLin Jen-Shin2016-08-301-1/+1
| * | | | Fix test for Pipeline#durationLin Jen-Shin2016-08-301-5/+17
| * | | | Smartly calculate real running time and pending timeLin Jen-Shin2016-08-291-0/+95
* | | | | Merge branch 'pipeline-hooks' into 'master' Rémy Coutable2016-09-083-24/+134
|\ \ \ \ \
| * | | | | Remove redundant tests, feedback:pipeline-hooksLin Jen-Shin2016-09-062-24/+0
| * | | | | Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-09-06105-683/+2744
| |\ \ \ \ \
| * | | | | | I am too used to have no spaces around default argsLin Jen-Shin2016-08-292-2/+2
| * | | | | | Use a completely fake webhook URL, feedback:Lin Jen-Shin2016-08-291-1/+1