summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-191-0/+2
|\
| * Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-191-0/+2
* | Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-193-0/+4
|\ \
| * | Allow environment_scope in cluster controllersMatija Čupić2017-12-163-0/+4
* | | Merge branch '40871-todo-notification-count-shows-notification-without-having...Douwe Maan2017-12-181-1/+0
|\ \ \
| * | | Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todoSean McGivern2017-12-181-1/+0
* | | | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-1/+30
|\ \ \ \ | |_|_|/ |/| | |
| * | | Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-nowStan Hu2017-12-121-15/+15
| * | | Fix Rubocop offense and use a symbol instead of a stringStan Hu2017-12-121-1/+1
| * | | Add a spec for rate limiting pipeline schedulesStan Hu2017-12-121-2/+2
| * | | Add rate limiting to guard against excessive scheduling of pipelinesStan Hu2017-12-121-0/+11
| * | | Fix Sidekiq worker and make flash message return a link to the pipelines pageStan Hu2017-12-121-1/+1
| * | | Create a play_pipeline_schedule policy and use itStan Hu2017-12-121-1/+5
| * | | Address some comments with running a pipeline scheduleStan Hu2017-12-121-3/+3
| * | | Add button to run scheduled pipeline immediatelyStan Hu2017-12-121-1/+15
* | | | Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-181-2/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-2/+6
* | | | Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-1517-43/+83
|\ \ \ \
| * | | | Backport changes from EELin Jen-Shin2017-12-151-1/+1
| * | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1533-156/+405
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-3018-43/+47
| |\ \ \ \ \
| * | | | | | Fix a few layout errorLin Jen-Shin2017-11-222-2/+1
| * | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2217-39/+39
| |\ \ \ \ \ \
| * | | | | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-2214-50/+50
| * | | | | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-1812-35/+52
| * | | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-1726-159/+186
| |\ \ \ \ \ \ \
| * | | | | | | | WIPLin Jen-Shin2017-11-067-16/+19
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0659-350/+737
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-2515-38/+77
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-1911-13/+16
| * | | | | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-1819-0/+20
* | | | | | | | | | | Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-141-1/+1
* | | | | | | | | | | | Merge branch '41136-job-erased' into 'master'Filipa Lacerda2017-12-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Change text from build to job in flash notice41136-job-erasedAnnabel Dunstone Gray2017-12-141-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'lfs-badge' into 'master'Douwe Maan2017-12-152-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | moved lfs_blob_ids method into ExtractsPath modulelfs-badgePhil Hughes2017-12-142-8/+1
| * | | | | | | | | | | moved lfs blob fetch from extractspath filePhil Hughes2017-12-142-0/+9
| * | | | | | | | | | | fixed project homepage not having correct variablePhil Hughes2017-12-111-1/+0
| * | | | | | | | | | | Added LFS badge to indicate LFS tracked filesPhil Hughes2017-12-111-0/+1
* | | | | | | | | | | | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-141-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-131-1/+4
* | | | | | | | | | | | Enable the performance bar in dev environmentsZeger-Jan van de Weg2017-12-131-0/+1
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using...Robert Speicher2017-12-125-9/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-125-9/+34
* | | | | | | | | | | | Merge branch 'single-list-multiple-clusters' into 'master'Kamil Trzciński2017-12-121-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove cluster scope from ClustersController#indexMatija Čupić2017-12-111-5/+2
* | | | | | | | | | | | Merge branch '40743-bug-accepting-new-group-members-when-permission-level-dev...Douwe Maan2017-12-112-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Bugfix: User can't change the access level of an access requesterRubén Dávila2017-12-112-2/+2
* | | | | | | | | | | | Merge branch 'mk-pick-10-2-4-security-fixes' into 'master'Winnie Hellmann2017-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
View Lorry Controller Status