summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Refactor the DeleteUserWorkerNick Thomas2017-06-052-4/+2
* Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-055-4/+101
|\
| * Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-fo...Luke "Jared" Bennett2017-06-02145-643/+4080
| |\
| * | Removed unneeded newline in issuables_helper_spec and removed unneeded update...Luke "Jared" Bennett2017-06-021-1/+0
| * | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-311-0/+26
| * | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-312-21/+18
| * | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-311-2/+2
| * | Review changes, improve editable helper spec and add hasUpdated computer to i...Luke "Jared" Bennett2017-05-311-2/+1
| * | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-315-4/+105
* | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-051-0/+1
|\ \ \
| * | | Add slugify project path to CI enviroment variablesvanadium232017-06-031-0/+1
* | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-059-61/+272
|\ \ \ \
| * | | | Fix test failuresKamil Trzcinski2017-06-033-5/+5
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-0284-529/+2435
| |\ \ \ \ | | |/ / /
| * | | | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-023-4/+7
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-0119-15/+310
| |\ \ \ \
| * | | | | Rename build to jobZ.J. van de Weg2017-06-011-2/+2
| * | | | | Incorporate reviewZ.J. van de Weg2017-05-315-8/+39
| * | | | | Create PipelineDetailsEntityZ.J. van de Weg2017-05-314-67/+144
| * | | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-314-11/+97
* | | | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-055-14/+214
|\ \ \ \ \ \
| * | | | | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-015-14/+214
* | | | | | | Improve user experience around slash commands in instant commentsKushal Pandya2017-06-052-37/+127
* | | | | | | Merge branch '25680-CI_ENVIRONMENT_URL' into 'master'Kamil Trzciński2017-06-055-165/+238
|\ \ \ \ \ \ \
| * | | | | | | Only deploy if environment exists; Update tests accordingly25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-032-108/+85
| * | | | | | | Make sure that environment was created before deployingLin Jen-Shin2017-06-021-0/+2
| * | | | | | | CreatePipelineBuildsService would have created envLin Jen-Shin2017-06-021-30/+0
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-0220-115/+699
| |\ \ \ \ \ \ \
| * | | | | | | | Fix other use of CreateDeploymentService and makeLin Jen-Shin2017-06-022-7/+35
| * | | | | | | | Fix a typo: not -> noLin Jen-Shin2017-06-011-1/+1
| * | | | | | | | Merge all environment url methods, introduce ensure_persisted_environmentLin Jen-Shin2017-06-011-25/+38
| * | | | | | | | split tests for expanded_environment_urlLin Jen-Shin2017-06-011-4/+25
| * | | | | | | | Simplify CreateDeploymentService so that it usesLin Jen-Shin2017-06-011-52/+33
| * | | | | | | | Introduce ci_environment_url which would fallbackLin Jen-Shin2017-06-011-6/+18
| * | | | | | | | Just use the url from options, not saving it as a columnLin Jen-Shin2017-06-014-15/+3
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-01161-924/+3525
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'Lin Jen-Shin (godfat)2017-05-2691-732/+2499
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pass external_url from environment if job doesn't have oneLin Jen-Shin2017-05-251-10/+32
| * | | | | | | | | | Add another test to make sure url would be passedLin Jen-Shin2017-05-251-0/+2
| * | | | | | | | | | Add tests for CI_ENVIRONMENT_URLLin Jen-Shin2017-05-251-6/+53
| * | | | | | | | | | Fix tests for adding environment_urlLin Jen-Shin2017-05-253-1/+11
* | | | | | | | | | | Fix LFS timeouts when trying to save large filessh-fix-lfs-from-moving-across-filesystemsStan Hu2017-06-041-0/+31
* | | | | | | | | | | Merge branch '32118-new-environment-btn-copy' into 'master'Annabel Dunstone Gray2017-06-032-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 32118 Make New environment empty state btn lowercase32118-new-environment-btn-copytauriedavis2017-06-022-2/+4
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'projects-api-import-status' into 'master'Douwe Maan2017-06-021-0/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Expose import_status in Projects APIRobin Bobbitt2017-06-021-0/+20
* | | | | | | | | | | | Merge branch 'mabes/gitlab-ce-bypass-auto-login' into 'master'Douwe Maan2017-06-024-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow manual bypass of auto_sign_in_with_providermabes/gitlab-ce-bypass-auto-loginMaxime Besson2017-06-024-2/+37
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch '28694-hard-delete-user-from-api' into 'master'Douwe Maan2017-06-021-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow users to be hard-deleted from the APINick Thomas2017-06-021-0/+20