summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-merge-service-with-no-source' into 'master' Rémy Coutable2017-02-171-1/+1
|\
| * Fix merge service error with no sourcefix-merge-service-with-no-sourceSean McGivern2017-02-171-1/+1
* | Merge branch '26379-iid-param' into 'master'Rémy Coutable2017-02-173-23/+6
|\ \
| * | add a :iids param to IssuableFindermhasbini2017-02-173-23/+6
* | | Merge branch 'fix-dependency-in-environments' into 'master' Clement Ho2017-02-174-6/+6
|\ \ \
| * | | Fix depenendencies loading Vue in EEFilipa Lacerda2017-02-174-6/+6
* | | | Merge branch 'gfm-autocomplete-fixes' into 'master' Alfredo Sumaran2017-02-171-2/+2
|\ \ \ \
| * | | | Fixes errors in GFM slash commands matcher and add tests for default matcherYarNayar2017-02-171-2/+2
* | | | | Merge branch 'zero-for-unlimited' into 'master' Annabel Dunstone Gray2017-02-171-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | changed minor inconsistency in help textzero-for-unlimiteddimitrieh2017-02-171-2/+2
* | | | | Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master' Kamil Trzciński2017-02-177-44/+84
|\ \ \ \ \
| * | | | | Remove support for locking in pipeline retry serviceGrzegorz Bizon2017-02-171-9/+1
| * | | | | Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-17205-2211/+2285
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Make build clone/retry implementation more robustfix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-161-18/+20
| * | | | | When retrying a build copy a coverage regex settingGrzegorz Bizon2017-02-151-0/+1
| * | | | | Close all pipeline todos at once when retrying itGrzegorz Bizon2017-02-152-1/+5
| * | | | | Make it possible to resolve all todos for pipelineGrzegorz Bizon2017-02-151-0/+6
| * | | | | Avoid race condition in build retry serviceGrzegorz Bizon2017-02-141-3/+2
| * | | | | Simplify implementation of build retry serviceGrzegorz Bizon2017-02-141-8/+2
| * | | | | Revert adding new methods in CI/CD stage classGrzegorz Bizon2017-02-141-12/+0
| * | | | | Simplify implementation of pipeline retry serviceGrzegorz Bizon2017-02-142-44/+6
| * | | | | Use new pipeline retry service with optimistic lockingGrzegorz Bizon2017-02-143-27/+39
| * | | | | Add after_stage scope to commit status classGrzegorz Bizon2017-02-143-12/+10
| * | | | | Reuse `Gitlab::Allowable` mixin in base serviceGrzegorz Bizon2017-02-141-4/+1
| * | | | | Preserve base service abstraction for retry servicesGrzegorz Bizon2017-02-143-47/+48
| * | | | | Fix Rubocop offense in pipeline retry serviceGrzegorz Bizon2017-02-131-1/+0
| * | | | | Implement new pipeline retry serviceGrzegorz Bizon2017-02-133-10/+41
| * | | | | Add a separate CI/CD pipeline retry service classGrzegorz Bizon2017-02-132-1/+25
| * | | | | Fix CI build specs after adding retry ability checkGrzegorz Bizon2017-02-131-3/+3
| * | | | | Add specs for build retry serviceGrzegorz Bizon2017-02-131-0/+6
| * | | | | Extract CI/CD build retry code to separate serviceGrzegorz Bizon2017-02-132-26/+44
| * | | | | Skip job only when canceling the pipeline it belongs toGrzegorz Bizon2017-02-132-3/+8
| * | | | | Fix pipeline specs related to canceling buildsGrzegorz Bizon2017-02-131-1/+1
| * | | | | Skip buils that were canceled but not started yetGrzegorz Bizon2017-02-131-1/+2
* | | | | | Merge branch 'task_list_refactor' into 'master' Fatih Acet2017-02-175-92/+68
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactorSimon Knox2017-02-1663-199/+255
| |\ \ \ \ \ \
| * | | | | | | update correct field for Notes - it's called note not descriptionSimon Knox2017-02-154-1/+5
| * | | | | | | code style and test fixesSimon Knox2017-02-141-0/+0
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactorSimon Knox2017-02-141-1/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactorSimon Knox2017-02-14266-1461/+2287
| |\ \ \ \ \ \ \ \
| * | | | | | | | | enable lintSimon Knox2017-02-101-4/+1
| * | | | | | | | | forgot to iifeSimon Knox2017-02-081-1/+1
| * | | | | | | | | notes use new task_list, and PATCH instead of POSTSimon Knox2017-02-085-24/+18
| * | | | | | | | | appease lintSimon Knox2017-02-081-9/+8
| * | | | | | | | | switch notes to use task_list, but keep its update function for nowSimon Knox2017-02-082-19/+14
| * | | | | | | | | copypaste task_list setup and events to own classSimon Knox2017-02-073-66/+53
* | | | | | | | | | Merge branch '28236-browse-button-dropping' into 'master' Fatih Acet2017-02-171-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Increase right side of file header to accommodate browse files button28236-browse-button-droppingAnnabel Dunstone Gray2017-02-161-1/+1
* | | | | | | | | | | Merge branch '27920-both-wip-messages-showing' into 'master' Fatih Acet2017-02-173-1/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Dispatch needed JS when creating a new MR in diff view27920-both-wip-messages-showingSam Rose2017-02-143-1/+4
View Lorry Controller Status