summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Compile JS lang files before webpack compileassets-task-compile-langsPhil Hughes2017-07-271-0/+1
| | | | Closes #35615
* Merge branch 'patch-19' into 'master'Clement Ho2017-07-261-1/+1
|\ | | | | | | | | change Fogbugz button to FogBugz See merge request !13113
| * change Fogbugz button to FogBugzBen Bodenmiller2017-07-261-1/+1
| |
* | Merge branch 'rs-update-large-table-list' into 'master'Grzegorz Bizon2017-07-261-0/+3
|\ \ | |/ |/| | | | | Update the large table list in AddColumnWithDefaultToLargeTable cop See merge request !13112
| * Update the large table list in AddColumnWithDefaultToLargeTable copRobert Speicher2017-07-261-0/+3
| | | | | | | | | | | | - ci_builds -- 33 million rows, 55 GB - merge_request_diff_files -- 5 million rows, 9 GB (and growing rapidly) - merge_request_diffs -- 5 million rows, 190 GB
* | Merge branch 'added-nvmrc' into 'master'Mike Greiling2017-07-261-0/+1
|\ \ | | | | | | | | | | | | added .nvmrc See merge request !9183
| * | Update .nvmrc to 7.5Luke "Jared" Bennett2017-06-221-1/+1
| | |
| * | added .nvmrcLuke "Jared" Bennett2017-06-221-0/+1
| | |
* | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-07-262-4/+4
|\ \ \ | |_|/ |/| | | | | | | | Use LDAP-attributes configured in gitlab.yml in lookup instead of just hard-coded attributes. See merge request !13054
| * | Use LDAP-attributes configured in gitlab.yml in lookup instead of just ↵Casper2017-07-262-4/+4
|/ / | | | | | | hard-coded attributes.
* | Merge branch 'fix/gb/handle-max-pages-artifacts-size-correctly' into 'master'Kamil Trzciński2017-07-263-1/+81
|\ \ | | | | | | | | | | | | | | | | | | Handle maximum pages artifacts size correctly Closes #35317 See merge request !13072
| * | Refactor max_size method in update pages servicefix/gb/handle-max-pages-artifacts-size-correctlyGrzegorz Bizon2017-07-261-3/+5
| | | | | | | | | | | | | | | As per review feedback https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13072#note_35853177
| * | Fix rubocop offense in update pages service specsGrzegorz Bizon2017-07-251-1/+1
| | |
| * | Add changelog for max pages artifacts size fixGrzegorz Bizon2017-07-251-0/+4
| | |
| * | Handle maximum pages artifacts size correctlyGrzegorz Bizon2017-07-252-1/+75
| | |
* | | Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-260-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Handle errors while a project is being deleted asynchronously. Closes #29289 See merge request !11088
* \ \ \ Merge branch '29289-project-destroy-clean-up-after-failure' into 'master'Sean McGivern2017-07-2613-49/+185
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Handle errors while a project is being deleted asynchronously. Closes #29289 See merge request !11088
| * | | Move exception handling to executeTiago Botelho2017-07-2610-76/+81
| | | |
| * | | Refactors Project Destroy service and worker codeTiago Botelho2017-07-202-21/+28
| | | |
| * | | Add specs for ProjectDestroyWorkerTiago Botelho2017-07-209-49/+63
| | | |
| * | | WIP: Display a project's `delete_error` on the project homepage.Timothy Andrew2017-07-202-0/+10
| | | |
| * | | Handle errors while a project is being deleted asynchronously.Timothy Andrew2017-07-206-4/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Rescue all errors that `Projects::DestroyService` might throw, to prevent the worker from leaving things in an inconsistent state 2. Unmark the project as `pending_delete` 3. Add a `delete_error` text column to `projects`, and save the error message in there, to be shown to the project masters/owners.
* | | | Merge remote-tracking branch 'dev/master'Douwe Maan2017-07-269-55/+391
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| * \ \ \ Merge branch 'mk-add-ldap-ssl-certificate-verification' into 'master'Douwe Maan2017-07-269-64/+400
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add LDAP SSL certificate verification See merge request !2115
| | * | | | Add net-ldap explicitly since we use it directlyMichael Kozono2017-07-262-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | And this has already been done on EE, so it’ll match now.
| | * | | | Mention how to test LDAP connectionsMichael Kozono2017-07-261-1/+2
| | | | | |
| | * | | | Fix plain LDAP (no encryption)Michael Kozono2017-07-264-7/+10
| | | | | |
| | * | | | Update more examplesMichael Kozono2017-07-262-3/+4
| | | | | |
| | * | | | Add changelog entryMichael Kozono2017-07-261-0/+4
| | | | | |
| | * | | | Change encryption descriptionMichael Kozono2017-07-261-11/+16
| | | | | |
| | * | | | Copy comment improvements from documentationMichael Kozono2017-07-261-4/+11
| | | | | |
| | * | | | Update LDAP SSL config optionsMichael Kozono2017-07-261-4/+32
| | | | | |
| | * | | | Fix code styleMichael Kozono2017-07-261-5/+5
| | | | | |
| | * | | | Add warning about certificate verification on loadMichael Kozono2017-07-261-1/+10
| | | | | |
| | * | | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-263-30/+6
| | | | | | | | | | | | | | | | | | | | | | | | And closer to the configuration setup. The code doesn’t need to know about this.
| | * | | | Pass configured `ssl_version` to `omniauth-ldap`Michael Kozono2017-07-262-0/+33
| | | | | |
| | * | | | Pass configured `ca_file` to `omniauth-ldap`Michael Kozono2017-07-262-0/+34
| | | | | |
| | * | | | Verify certificates in `omniauth-ldap`Michael Kozono2017-07-262-1/+32
| | | | | |
| | * | | | Set `Net::LDAP` `ssl_version` optionMichael Kozono2017-07-262-0/+31
| | | | | |
| | * | | | Set `Net::LDAP` `ca_file` optionMichael Kozono2017-07-262-5/+45
| | | | | |
| | * | | | Set `Net::LDAP` encryption properlyMichael Kozono2017-07-262-19/+117
| | | | | |
| | * | | | Use encryption instead of methodMichael Kozono2017-07-262-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | The method key is deprecated in the `gitlab_omniauth-ldap` gem.
| | * | | | Add LDAP config optionsMichael Kozono2017-07-262-1/+34
| | | | | |
| | * | | | Upgrade omniauth-ldap gem (and some dependencies)Michael Kozono2017-07-262-9/+9
| |/ / / / | | | | | | | | | | | | | | | Most notably, the net-ldap gem.
* | | | | Merge branch 'mk-fix-master-wiki-web-url-spec' into 'master'Douwe Maan2017-07-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix project wiki web_url spec See merge request !13105
| * | | | | Fix project wiki web_url specMichael Kozono2017-07-261-1/+1
| | | | | |
* | | | | | Merge branch 'mk-add-lower-path-index-to-redirect-routes' into 'master'Yorick Peterse2017-07-264-1/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add lower path index to redirect_routes Closes #34638 See merge request !13062
| * | | | | | Add lower path index to redirect_routesmk-add-lower-path-index-to-redirect-routesMichael Kozono2017-07-254-1/+41
| | | | | | |
* | | | | | | Merge branch 'add-missing-colon' into 'master'Sean McGivern2017-07-261-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Add missing colon See merge request !13099
| * | | | | | Add missing colonMax Raab2017-07-261-1/+1
|/ / / / / /
View Lorry Controller Status