summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow artifacts downloads with gitlab-ci-tokenzj-api-artifacts-ci-token-accessZ.J. van de Weg2017-06-068-99/+298
* Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-0520-30/+237
|\
| * Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-023-2/+7
| * Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-fo...Luke "Jared" Bennett2017-06-02510-2512/+9152
| |\
| * | Removed unneeded newline in issuables_helper_spec and removed unneeded update...Luke "Jared" Bennett2017-06-022-3/+1
| * | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-312-23/+49
| * | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-314-35/+30
| * | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-312-3/+3
| * | Fix helper methods returning wrong data types for vueLuke "Jared" Bennett2017-05-312-3/+7
| * | Move issuable_app_data to helperLuke "Jared" Bennett2017-05-312-4/+9
| * | Review changes, improve editable helper spec and add hasUpdated computer to i...Luke "Jared" Bennett2017-05-313-7/+11
| * | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-3119-28/+241
* | | Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'Kamil Trzciński2017-06-054-1/+8
|\ \ \
| * | | Add slugify project path to CI enviroment variablesvanadium232017-06-034-1/+8
* | | | Merge branch 'zj-job-view-goes-real-time' into 'master'Kamil Trzciński2017-06-0522-92/+430
|\ \ \ \
| * | | | retryable? is now available for CommitStatuszj-job-view-goes-real-timeZ.J. van de Weg2017-06-041-1/+6
| * | | | Fix test failuresKamil Trzcinski2017-06-034-9/+14
| * | | | Fix test failuresKamil Trzcinski2017-06-021-4/+2
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeKamil Trzcinski2017-06-02328-1735/+5166
| |\ \ \ \ | | |/ / /
| * | | | Add user to BuildDetailsEntityZ.J. van de Weg2017-06-025-9/+18
| * | | | Merge remote-tracking branch 'origin/master' into zj-job-view-goes-real-timeZ.J. van de Weg2017-06-0151-57/+661
| |\ \ \ \
| * | | | | Rename build to jobZ.J. van de Weg2017-06-014-8/+8
| * | | | | Incorporate reviewZ.J. van de Weg2017-05-3113-34/+106
| * | | | | Create PipelineDetailsEntityZ.J. van de Weg2017-05-3111-110/+198
| * | | | | Initial implementation for real time job viewZ.J. van de Weg2017-05-3111-21/+170
* | | | | | Merge branch 'sidekiq-transaction' into 'master'Sean McGivern2017-06-059-21/+91
|\ \ \ \ \ \
| * | | | | | Fix keys seedDouwe Maan2017-06-022-11/+24
| * | | | | | Don’t schedule workers from inside transactionsDouwe Maan2017-06-027-20/+32
| * | | | | | Allow scheduling from after_commit hooksDouwe Maan2017-06-021-9/+27
| * | | | | | Forbid Sidekiq scheduling in transactionsYorick Peterse2017-06-021-0/+27
* | | | | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-0553-50/+1253
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '30469-convdev-index' of gitlab.com:gitlab-org/gitlab-ce into 30...30469-convdev-indexSimon Knox2017-06-033-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Fix copyAdam Niedzielski2017-06-021-1/+1
| | * | | | | | | Use sum instead of map + injectAdam Niedzielski2017-06-022-3/+3
| * | | | | | | | fixup some classnames and media queriesSimon Knox2017-06-032-34/+16
| |/ / / / / / /
| * | | | | | | Add border radiusAnnabel Dunstone Gray2017-06-011-0/+1
| * | | | | | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-0153-50/+1270
* | | | | | | | Merge branch '27614-improve-instant-comments-exp' into 'master'Phil Hughes2017-06-056-56/+232
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve user experience around slash commands in instant commentsKushal Pandya2017-06-056-56/+232
|/ / / / / / / /
* | | | | | | | Merge branch '25680-CI_ENVIRONMENT_URL' into 'master'Kamil Trzciński2017-06-0513-228/+313
|\ \ \ \ \ \ \ \
| * | | | | | | | Only deploy if environment exists; Update tests accordingly25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-033-109/+86
| * | | | | | | | Make sure that environment was created before deployingLin Jen-Shin2017-06-022-0/+6
| * | | | | | | | CreatePipelineBuildsService would have created envLin Jen-Shin2017-06-023-37/+1
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-02101-345/+1299
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix other use of CreateDeploymentService and makeLin Jen-Shin2017-06-025-15/+40
| * | | | | | | | | Fix a typo: not -> noLin Jen-Shin2017-06-011-1/+1
| * | | | | | | | | Merge all environment url methods, introduce ensure_persisted_environmentLin Jen-Shin2017-06-013-41/+56
| * | | | | | | | | split tests for expanded_environment_urlLin Jen-Shin2017-06-011-4/+25
| * | | | | | | | | Simplify CreateDeploymentService so that it usesLin Jen-Shin2017-06-014-111/+73
| * | | | | | | | | Introduce ci_environment_url which would fallbackLin Jen-Shin2017-06-012-21/+31
View Lorry Controller Status