summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix shared blob viewer for snippets.css-refactor-buttonsJacob Schatz2017-10-272-3/+3
|
* Snippet formJacob Schatz2017-10-271-4/+4
|
* test web hooks button.Jacob Schatz2017-10-271-1/+1
|
* Fix sherlock stuff more refactors.Jacob Schatz2017-10-276-7/+7
|
* Fix more sherlockJacob Schatz2017-10-271-1/+1
|
* Fix sherlock buttonsJacob Schatz2017-10-271-1/+1
|
* Snippet header action buttons refactorJacob Schatz2017-10-272-8/+8
|
* Snippit actions.Jacob Schatz2017-10-271-1/+1
|
* u2f authJacob Schatz2017-10-271-1/+1
|
* Refactor css 2fa page.Jacob Schatz2017-10-271-2/+2
|
* user show refactor buttons.Jacob Schatz2017-10-271-2/+2
|
* Profile page.Jacob Schatz2017-10-271-2/+2
|
* Update buttonsJacob Schatz2017-10-231-3/+3
|
* Edit deploy keyJacob Schatz2017-10-191-2/+2
|
* Dashboard index.Jacob Schatz2017-10-192-5/+5
|
* Broadcast message buttonJacob Schatz2017-10-191-2/+2
|
* show app buttonsJacob Schatz2017-10-191-1/+1
|
* Update applications index.Jacob Schatz2017-10-192-2/+2
|
* Applications form in admin settingsJacob Schatz2017-10-192-4/+4
|
* update application settings form.Jacob Schatz2017-10-191-2/+2
|
* Abuse report buttonsJacob Schatz2017-10-192-5/+5
|
* Fix abuse page.Jacob Schatz2017-10-192-6/+6
|
* Merge branch 'update-nav-sidebar-hover' into 'master'Annabel Dunstone Gray2017-10-191-3/+3
|\ | | | | | | | | | | | | Update nav sidebar hover color to increase contrast Closes #37660 See merge request gitlab-org/gitlab-ce!14829
| * update nav sidebar hover color to increase contrastupdate-nav-sidebar-hovertauriedavis2017-10-111-3/+3
| |
* | Merge branch 'docs/Wernight/gitlab-ce-patch-28' into 'master'Achilleas Pipinellis2017-10-191-19/+0
|\ \ | | | | | | | | | | | | Updates google.md to match current version. See merge request gitlab-org/gitlab-ce!14912
| * | Updates google.md to match current version.docs/Wernight/gitlab-ce-patch-28Werner Beroux2017-10-171-19/+0
| | |
* | | Merge branch 'sh-document-plus-encoding-api' into 'master'Achilleas Pipinellis2017-10-191-0/+17
|\ \ \ | | | | | | | | | | | | | | | | Document converting `+` to `%2B` in an API query parameter See merge request gitlab-org/gitlab-ce!14948
| * | | Document converting `+` to `%2B` in an API query parametersh-document-plus-encoding-apiStan Hu2017-10-181-0/+17
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'sh-api-json-logs' into 'master'Achilleas Pipinellis2017-10-191-2/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add docs for `api_json.log` file See merge request gitlab-org/gitlab-ce!14950
| * | | | Add docs for `api_json.log` filesh-api-json-logsStan Hu2017-10-181-2/+22
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-10-1915-1147/+8176
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE port of EE translations See merge request gitlab-org/gitlab-ce!14954
| * | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-10-1915-1147/+8176
|/ / / / / | | | | | | | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!3030
* | | | | Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ↵Stan Hu2017-10-192-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update Prometheus gem to fix problems with other Processes overwriting current metrics file Closes #36714 See merge request gitlab-org/gitlab-ce!14827
| * | | | | Update Prometheus gem to fix problems with other files overwriting current filePawel Chojnacki2017-10-192-3/+3
| | | | | |
* | | | | | Merge branch 'rc/balance-test-job-nodes' into 'master'Robert Speicher2017-10-191-63/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodes See merge request gitlab-org/gitlab-ce!14936
| * | | | | | Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodesrc/balance-test-job-nodesRémy Coutable2017-10-181-63/+63
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'rc/reduce-duplication-in-tests-metadata-state-job-definition' ↵Robert Speicher2017-10-191-9/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Improve the .tests-metadata-state definition a bit See merge request gitlab-org/gitlab-ce!14937
| * | | | | | Improve the .tests-metadata-state definition a bitrc/reduce-duplication-in-tests-metadata-state-job-definitionRémy Coutable2017-10-181-9/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '18765-stub_env_in_specs' into 'master'Robert Speicher2017-10-199-202/+246
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add a 'custom cop' to RuboCop that bans ENV assignment" Closes #18765 See merge request gitlab-org/gitlab-ce!14810
| * | | | | | Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs18765-stub_env_in_specsRémy Coutable2017-10-184-5/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Stub ENV in the LDAP task spec fileRémy Coutable2017-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Stub ENV in the Gitaly task spec fileRémy Coutable2017-10-181-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Stub ENV in the backup task spec fileRémy Coutable2017-10-183-188/+109
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-194-3/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders 404 in commits controller if no commits are found Closes #37620 See merge request gitlab-org/gitlab-ce!14610
| * | | | | | Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-184-3/+37
| | | | | | |
* | | | | | | Merge branch '34754-graphql-policy-update' into 'master'Douwe Maan2017-10-192-1/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GraphQL licensing situation in the docs See merge request gitlab-org/gitlab-ce!14940
| * | | | | | | Update GraphQL licensing situation in the docsNick Thomas2017-10-182-1/+17
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'sh-fix-broken-docker-delete' into 'master'Grzegorz Bizon2017-10-194-5/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inability to delete container registry tags Closes #39260 See merge request gitlab-org/gitlab-ce!14947
| * | | | | | | Fix broken function invocationsh-fix-broken-docker-deleteFilipa Lacerda2017-10-192-2/+2
| | | | | | | |
| * | | | | | | Fix inability to delete container registry tagsStan Hu2017-10-182-3/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
View Lorry Controller Status