summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Yet, another errorsdosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-uiKamil Trzcinski2017-04-072-2/+5
|
* Another round of code reviewKamil Trzcinski2017-04-072-4/+10
|
* Fix changelogKamil Trzcinski2017-04-071-2/+2
|
* Fix test failuresKamil Trzcinski2017-04-074-4/+6
|
* Simplify ifKamil Trzcinski2017-04-071-1/+1
|
* Update code to remove no longer needed changesKamil Trzcinski2017-04-072-7/+1
|
* Update migrationsKamil Trzcinski2017-04-074-45/+14
|
* Update tests to cover trigger scheduleKamil Trzcinski2017-04-075-32/+82
|
* Fix ref referenceKamil Trzcinski2017-04-0710-36/+119
|
* N/A to None. Revert validates from validates_presence_of.Shinya Maeda2017-04-072-2/+2
|
* create_params and update_params into trigger_paramsShinya Maeda2017-04-071-11/+4
|
* Add def trigger_schedule in Trigger. Use persisted? for checling existanceShinya Maeda2017-04-074-3/+5
|
* before_create :set_project. Now TriggerSchedule saves project from parentShinya Maeda2017-04-072-5/+5
|
* Add specs in triggers_spec.rb (Halfway)Shinya Maeda2017-04-071-0/+8
|
* Use allow_destroy. Remove condtion from form.haml.Shinya Maeda2017-04-074-24/+13
|
* Add form for scheduled triggerShinya Maeda2017-04-077-4/+59
|
* Merge branch '30056-rename-milestones-empty' into 'master'Robert Speicher2017-04-073-16/+4
|\ | | | | | | | | | | | | Removed `Milestone#is_empty?` Closes #30056 See merge request !10523
| * Removed `Milestone#is_empty?`Jacopo2017-04-073-16/+4
| | | | | | | | Removed `Milestone#is_empty?` because is not used anymore in the codebase
* | Merge branch 'dz-hide-zero-counter' into 'master' Dmitriy Zaporozhets2017-04-073-15/+36
|\ \ | | | | | | | | | | | | | | | | | | Hide zero counters on header Closes #30449 See merge request !10506
| * | Hide header counters for issue/mr/todos if zerodz-hide-zero-counterDmitriy Zaporozhets2017-04-073-15/+36
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'update-droplab-to-webpack-version' into 'master' Jacob Schatz2017-04-0736-1622/+2585
|\ \ \ | | | | | | | | | | | | | | | | Update droplab See merge request !9444
| * | | Update droplabLuke "Jared" Bennett2017-04-0736-1622/+2585
|/ / /
* | | Merge branch 'qa/gb/fix-new-group-button-label' into 'master' Rémy Coutable2017-04-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix new group button label in GitLab QA specs See merge request !10529
| * | | Fix new group button label in GitLab QA specsGrzegorz Bizon2017-04-071-1/+1
| | | |
* | | | Merge branch 'gitaly-repository-message' into 'master' Sean McGivern2017-04-0711-41/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Send more Gitaly::Repository fields See merge request !10499
| * | | | Use Gitlab::Git::Repository#gitaly_... moreJacob Vosmaer2017-04-077-21/+17
| | | | |
| * | | | Remove spacesJacob Vosmaer2017-04-071-3/+3
| | | | |
| * | | | Combine delegations in one lineJacob Vosmaer2017-04-071-2/+1
| | | | |
| * | | | Remove unused codeJacob Vosmaer2017-04-071-4/+0
| | | | |
| * | | | Send more Gitaly::Repository fieldsJacob Vosmaer2017-04-078-26/+40
| | | | |
* | | | | Merge branch 'docs-search' into 'master' Sean Packham (GitLab)2017-04-0711-23/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Search through GitLab Closes #13251 See merge request !10463
| * | | | | Doc: Search through GitLabMarcia Ramos2017-04-0711-23/+117
|/ / / / /
* | | | | Merge branch '28574-jira-trigers' into 'master' Sean McGivern2017-04-073-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove confusing placeholder for JIRA transition_id Closes #28574 See merge request !10421
| * | | | | Remove confusing placeholder for JIRA transition_idJarka Kadlecova2017-04-053-2/+6
| | | | | |
* | | | | | Merge branch 'feature/service-desk-be-backport' into 'master' Sean McGivern2017-04-073-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport permissions and multi-line array to CE See merge request !10507
| * | | | | | Backport permissions and multi-line array to CEFelipe Artur2017-04-073-1/+8
| | | | | | |
* | | | | | | Merge branch '27724-fe-update-trace-handling-code' into 'master' Jacob Schatz2017-04-074-173/+238
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FE: Resolve "Performance issues when processing large build traces with Ansi2html" Closes #27724 See merge request !10336
| * | | | | | FE: Resolve "Performance issues when processing large build traces with ↵Filipa Lacerda2017-04-074-173/+238
|/ / / / / / | | | | | | | | | | | | | | | | | | Ansi2html"
* | | | | | Merge branch '24240-prometheus_healthz' into 'master' Douwe Maan2017-04-0717-20/+662
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track application readiness Closes #24240 See merge request !10416
| * | | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track ↵Paweł Chojnacki2017-04-0717-20/+662
|/ / / / / / | | | | | | | | | | | | | | | | | | application readiness
* | | | | | Merge branch '8998_skip_pending_commits_if_not_head' into 'master' Kamil Trzciński2017-04-0735-160/+550
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auto-cancel for pending pipelines on branch, if they are not HEAD See merge request !9362
| * | | | | | Fix bad conflict resolutionLin Jen-Shin2017-04-071-6/+5
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-04-07208-1080/+2267
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8998_skip_pending_commits_if_not_head * upstream/master: (58 commits) Fix icon name error Rewrite system note helper Change edit icon Leave icon area blank if legacy note; remove diamond icon Fix positioning of note icons Fix newline errors Add remaining system note icons Add system notes icon helper; add icons Fixed specs Updated JS that was causing the hints to appear & then disappear Update tests Fix broken spinach test Reuse code Improve shortcuts code Adds ShortcutsDashboardNavigation to globals comment since its a global variable Fix shortcut specs Reorganize shortcut help menu Change todos shortcut to shift Change shortcuts Switch global shortcuts to shift; reuse key styles from help menu Map bindings to lowercase letters; only show key bindings when using keyboard shortcut ...
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2017-04-07246-1551/+6072
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8998_skip_pending_commits_if_not_head * upstream/master: (197 commits) Add text to break up diagrams Implement review comments from @DouweM for !10467. Fix rubocop offence Linking to edit file directly Optimise trace handling code to use streaming instead of full read Use config.toml to configure Gitaly Fix indexes in container repositories table Recent search history for issues Fix rubocop Use change direction in spec Use be_pending Improve trigger_schedule.rb Implement a offset calculation on cron_parser_spec Clean up trigger_schedule_worker_spec.rb Improve instantiate recursion in cron_parser.rb Fix unnecessary changes in schema.rb Add empty line in cron_parser.rb Use parenthesis for respond_to :ref Define next_time as let in trigger_schedule_spec Remove next_run_at: nil from trigger_schedule_spec ...
| * | | | | | | Make sure that's canceledLin Jen-Shin2017-04-071-1/+1
| | | | | | | |
| * | | | | | | Fix test by ignoring auto_canceled_by for jobsLin Jen-Shin2017-04-071-3/+4
| | | | | | | |
| * | | | | | | Fix typoLin Jen-Shin2017-04-071-1/+1
| | | | | | | |
| * | | | | | | Fix rubocop offenses8998_skip_pending_commits_if_not_headLin Jen-Shin2017-04-062-2/+2
| | | | | | | |
| * | | | | | | Bump schema versionLin Jen-Shin2017-04-061-1/+1
| | | | | | | |
| * | | | | | | Use before_transitionLin Jen-Shin2017-04-061-4/+4
| | | | | | | |