summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-082-9/+28
|\ | | | | | | | | | | | | Resolve "Group dashboard UI" Closes #25426 See merge request !11098
| * Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-084-21/+21
| |\
| * | Use group and project finders instead of direct ActiveRecord relationsDouwe Maan2017-06-071-10/+11
| | |
| * | Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0766-200/+281
| |\ \
| * | | Minor visual adjustmentsAlfredo Sumaran2017-06-061-1/+1
| | | |
| * | | Add json support to group members leave action in controllerDmitriy Zaporozhets2017-06-061-2/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets2017-06-0265-536/+914
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Serialize groups as json for Dashboard::GroupsControllerDmitriy Zaporozhets2017-05-041-7/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Use Diff::File blob methods from diff highlighterdm-highlight-diff-file-blobDouwe Maan2017-06-081-3/+5
| |_|_|/ |/| | |
* | | | Merge branch 'allow-reporters-to-promote-group-labels' into 'master'Douwe Maan2017-06-081-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow group reporters to promote labels See merge request !12006
| * | | | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | They can admin group labels anyway, we weren't checking the more specific permission.
* | | | | Merge branch 'zj-i18n-pipeline-schedules' into 'master'Douwe Maan2017-06-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow translation of Pipeline Schedules See merge request !11974
| * | | | | Allow translation of Pipeline SchedulesZ.J. van de Weg2017-06-081-2/+2
| |/ / / /
* | | | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-081-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Blob#load_all_data! doesn’t need an argument See merge request !11977
| * | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-071-3/+3
| | |_|/ | |/| |
* | | | Translate project & repository pagesBob Van Landuyt2017-06-071-13/+13
|/ / /
* | | Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-2/+2
| | |
* | | Merge branch 'expand-backlog-closed-lists-issue-boards' into 'master'Douwe Maan2017-06-071-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expand/collapse close & backlog lists in issue boards Closes #23917 See merge request !11820
| * | | moved creating backlog list into list servicePhil Hughes2017-06-061-2/+2
| | | |
| * | | Expand/collapse close & backlog lists in issue boardsPhil Hughes2017-05-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The closed & backlog lists in issue boards are no collapsible. They can be collapsed independently of each other & this selection is then saved to the browser through localStorage. When the page loads, the code gets the data from localStorage & determines whether to show or hide the list Closes #23917
* | | | Merge branch '3191-deploy-keys-update' into 'master'Rémy Coutable2017-06-072-6/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement ability to update deploy keys Closes #3191 See merge request !10383
| * | | | Implement ability to update deploy keysAlexander Randa2017-06-022-6/+47
| | | | |
* | | | | Merge branch 'feature/gb/persist-pipeline-stages' into 'master'Kamil Trzciński2017-06-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist stages in the database Closes #26481 See merge request !11790
| * \ \ \ \ Merge branch 'feature/gb/migrate-pipeline-stages' into ↵Grzegorz Bizon2017-06-069-91/+37
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/persist-pipeline-stages * feature/gb/migrate-pipeline-stages: (76 commits) redesign caching of application settings Fix binary encoding error on MR diffs Fix missing tooltip and ARIA labels for accessibility Add info on using self-signed certs with Registry Actually clean gitlab-test path when TestEnv.set_repo_refs fails Introduce optimistic locking support via optional parameter last_commit_id on File Update API Move issuable bulk edit form into a new sidebar. Add PowerShell to CI variable docs Responsive environment tables Accept a username for User-level Events API Introduce an Events API Update GitLab Pages to v0.4.3 Allow numeric pages domain Remove references to old settings location Resolve "API: Environment info missed" Fix Projects API spec Resolve "When changing project visibility setting, change other dropdowns automatically" Update explanation of job-level variable override to fit example change headings to improve SEO backports changed import logic from pull mirroring feature into CE ...
| * \ \ \ \ \ Merge branch 'master' into feature/gb/persist-pipeline-stagesGrzegorz Bizon2017-06-0532-211/+394
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (524 commits) Improve user experience around slash commands in instant comments Fix LFS timeouts when trying to save large files retryable? is now available for CommitStatus Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables" Fix test failures Add slugify project path to CI enviroment variables Fixed typo: craeted -> created 32118 Make New environment empty state btn lowercase Expose import_status in Projects API 32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon Fix test failures Allow manual bypass of auto_sign_in_with_provider Fix keys seed Allow users to be hard-deleted from the API fixup some classnames and media queries Enable the Style/PreferredHashMethods cop Lint our factories creation in addition to their build Don’t schedule workers from inside transactions Allow scheduling from after_commit hooks Forbid Sidekiq scheduling in transactions ... Conflicts: app/serializers/pipeline_entity.rb db/schema.rb spec/factories/ci/stages.rb spec/lib/gitlab/import_export/safe_model_attributes.yml spec/services/ci/create_pipeline_service_spec.rb spec/spec_helper.rb
| * | | | | | | Rename pipeline methods related to legacy stagesGrzegorz Bizon2017-06-011-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-074-17/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Prometheus metrics endpoint and basic infrastructure to meter code See merge request !11553
| * | | | | | | | Move Prometheus presentation logic to PrometheusTextPawel Chojnacki2017-06-022-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Use NullMetrics to mock metrics when unused + Use method_missing in NullMetrics mocking + Update prometheus gem to version that correctly uses transitive dependencies + Ensure correct folders are used in Multiprocess prometheus client tests. + rename Sessions controller's metric
| * | | | | | | | Make login_counter instance variable instead of class one.Pawel Chojnacki2017-06-023-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + remove unecessarey require + fix small formatiing issues
| * | | | | | | | Move most of MetricsController logic to MetricsServicePawel Chojnacki2017-06-021-35/+6
| | | | | | | | |
| * | | | | | | | Use interpolation instead of concatenationPawel Chojnacki2017-06-021-4/+4
| | | | | | | | |
| * | | | | | | | move check if metrics are enabled to before actionPawel Chojnacki2017-06-021-2/+6
| | | | | | | | |
| * | | | | | | | Correctly handle temporary folder for testing multiproces metricsPawel Chojnacki2017-06-021-1/+1
| | | | | | | | |
| * | | | | | | | Use only ENV for metrics folder locationPawel Chojnacki2017-06-021-2/+6
| | | | | | | | |
| * | | | | | | | Bring back the tokenPawel Chojnacki2017-06-021-0/+1
| | | | | | | | |
| * | | | | | | | Split metrics from health controller into metrics controllerPawel Chojnacki2017-06-022-29/+41
| | | | | | | | |
| * | | | | | | | Prometheus settingsPawel Chojnacki2017-06-021-0/+1
| | | | | | | | |
| * | | | | | | | Add trailing newline to response.Kevin Lyda2017-06-022-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prometheus requires a trailing newline in its response. + cleanup
| * | | | | | | | Prometheus metrics first passPawel Chojnacki2017-06-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | metrics wip
| * | | | | | | | Initial pass at prometheus monitoring.Kevin Lyda2017-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a step for #29118. Add a single metric to count successful logins. Summary types are not supported so remove Collector. Either we need to support the summary type or we need to create a multiprocess-friendly Collector. Add config to load prometheus and set up the Collector and the Exporter. Fix `Gemfile` as current prometheus-client gemspec is missing the `mmap2` dependency.
* | | | | | | | | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-073-3/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| * | | | | | | | | Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-072-3/+10
| | | | | | | | | |
| * | | | | | | | | Support descriptions for snippetsJarka Kadlecova2017-05-313-2/+14
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'zj-read-registry-pat' into 'master'Kamil Trzciński2017-06-072-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow pulling container images using personal access tokens Closes #19219 See merge request !11845
| * | | | | | | | | Fix test failureszj-read-registry-patZ.J. van de Weg2017-06-061-1/+1
| | | | | | | | | |
| * | | | | | | | | Create read_registry scope with JWT authZ.J. van de Weg2017-06-052-4/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first commit doing mainly 3 things: 1. create a new scope and allow users to use it 2. Have the JWTController respond correctly on this 3. Updates documentation to suggest usage of PATs There is one gotcha, there will be no support for impersonation tokens, as this seems not needed. Fixes gitlab-org/gitlab-ce#19219
* | | | | | | | | Add a rubocop rule to check if a method 'redirect_to' is used without ↵31840-add-a-rubocop-that-forbids-redirect_to-inside-a-controller-destroy-action-without-an-explicit-statusblackst0ne2017-06-0743-52/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explicitly set 'status' in 'destroy' actions of controllers
* | | | | | | | | Limit non-administrators to adding 100 members at a time to groups and projectsNick Thomas2017-06-062-6/+8
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'Douwe Maan2017-06-051-8/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backports changed import logic from pull mirroring feature into CE See merge request !11850
| * | | | | | | | backports changed import logic from pull mirroring feature into CETiago Botelho2017-06-051-8/+1
| | |_|_|_|/ / / | |/| | | | | |
View Lorry Controller Status