summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rework subgroup endpointbvl-show-projects-in-group-treeBob Van Landuyt2017-09-0135-208/+982
|
* Merge branch 'backstage/gb/optimize-system-note-service-specs' into 'master'Sean McGivern2017-08-311-22/+8
|\ | | | | | | | | Optimize system note service specs See merge request !13958
| * Optimize system note service specsGrzegorz Bizon2017-08-311-22/+8
| |
* | Merge branch '31470-api-file-raw' into 'master'Sean McGivern2017-08-313-6/+22
|\ \ | | | | | | | | | | | | | | | | | | Fix the /projects/:id/repository/files/:file_path/raw endpoint to handle dots in the file_path… Closes #31470 See merge request !13512
| * | fix :file_path - add requirements:Marc Siegfriedt2017-08-303-6/+22
| | |
* | | Merge branch 'gitaly-440-shell-fetch-remote' into 'master'Sean McGivern2017-08-316-35/+107
|\ \ \ | | | | | | | | | | | | | | | | Migrate Repository.FetchRemote to Gitaly See merge request !13625
| * | | Migrate Repository.FetchRemote to Gitalygitaly-440-shell-fetch-remoteKim "BKC" Carlbäcker2017-08-306-35/+107
| | | | | | | | | | | | | | | | - `Gitlab::Shell.fetch_remote` now takes a `Gitlab::Git::Repository` instead
* | | | Merge branch '28202_decrease_abc_threshold_step3' into 'master'Grzegorz Bizon2017-08-313-41/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Decrease ABC threshold to 55.25 See merge request !13904
| * | | | Decrease ABC threshold to 55.25Maxim Rydkin2017-08-313-41/+48
|/ / / /
* | | | Merge branch '37179-dashboard-project-dropdown' into 'master'Phil Hughes2017-08-313-20/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes disabled state from projects dropdown in dashboard page Closes #37179 See merge request !13933
| * \ \ \ Merge branch 'master' into 37179-dashboard-project-dropdown37179-dashboard-project-dropdownFilipa Lacerda2017-08-31112-794/+1536
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (65 commits) Upgrade mail and nokogiri gems due to security issues Link out to stackoverflow answer on setting swappiness Document swappiness recomendations in the requirements doc Fix invalid attribute used for time-ago-tooltip component Update latest artifacts doc Add changelog entry for flipping verify_certificates Default LDAP config verify_certificates to true Update share project with groups docs remove accidental console.log from karma tests update specs to match reorganized monitoring components Remove tooltips from new sidebar Use `git update-ref --stdin -z` to delete refs Don't use public_send in destroy_conditionally! helper Remove unused expressions policy from ci/cd config Simplify code for appending strategies in CI/CD config Raise exception when simplifiable ci entry incomplete Add changelog entry Fix MySQL failure for emoji autocomplete max-width for lazy-loaded images (this was removed in the original MR through merge resolution most probably) Make namespace dropdown on new project page consistent ...
| * | | | | Use the correct scope to avoid triggering all dropdownsFilipa Lacerda2017-08-301-6/+6
| | | | | |
| * | | | | puts back `function` statementsFilipa Lacerda2017-08-301-20/+20
| | | | | |
| * | | | | Removes disabled state from projects dropdown in dashboard pageFilipa Lacerda2017-08-303-39/+35
| | | | | |
* | | | | | Merge branch '36917-branch-tooltip' into 'master'Phil Hughes2017-08-312-5/+20
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a tooltip to the branch name Closes #36917 See merge request !13925
| * | | | | Adds a tooltip to the branch nameFilipa Lacerda2017-08-312-5/+20
|/ / / / /
* | | | | Merge branch '31358_decrease_perceived_complexity_threshold_step1' into 'master'Grzegorz Bizon2017-08-311-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Decrease Metrics/PerceivedComplexity threshold to 17 See merge request !13947
| * | | | | Decrease Metrics/PerceivedComplexity threshold to 17Maxim Rydkin2017-08-311-1/+1
| | | | | |
* | | | | | Merge branch '26692-predefined-variable-gitlab-user-name' into 'master'Grzegorz Bizon2017-08-314-3/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Predefined Variable GITLAB_USER_NAME" Closes #26692 See merge request !13824
| * | | | | | Add a Build Variable to represent the triggering GitLab user's login usernameMark Fletcher2017-08-304-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Predefined variable represents the username of the GitLab user that started a build
| * | | | | | Add a Build Variable to represent the triggering GitLab user's nameMark Fletcher2017-08-303-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Predefined variable represents the name of the GitLab user that started a build
* | | | | | | Merge branch 'google-protobuf-3.4.0.2' into 'master'Marin Jankovski2017-08-311-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Use google-protobuf 3.4.0.2 See merge request !13796
| * | | | | | Use google-protobuf 3.4.0.2google-protobuf-3.4.0.2Jacob Vosmaer2017-08-241-1/+1
| | | | | | |
* | | | | | | Merge branch 'winh-merge-request-version-dropdowns' into 'master'Phil Hughes2017-08-311-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make merge request version dropdowns consistent See merge request !13590
| * | | | | | | Make merge request version dropdowns consistentwinh-merge-request-version-dropdownswinh2017-08-281-0/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'winh-namespace-select-dropdown' into 'master'Phil Hughes2017-08-311-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make namespace select dropdowns consistent See merge request !13626
| * | | | | | | Make namespace select dropdowns consistentwinh-namespace-select-dropdownwinh2017-08-281-0/+2
| |/ / / / / /
* | | | | | | Merge branch 'remove-unnecessary-console-log' into 'master'Phil Hughes2017-08-310-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove accidental console.log from karma tests See merge request !13936
| * | | | | | | remove accidental console.log from karma testsremove-unnecessary-console-logMike Greiling2017-08-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci-skip]
* | | | | | | | Merge branch 'mk-default-ldap-verify-certificates-secure' into 'master'Douwe Maan2017-08-314-18/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default LDAP config verify_certificates to true Closes #33662 See merge request !13915
| * | | | | | | Add changelog entry for flipping verify_certificatesmk-default-ldap-verify-certificates-secureMichael Kozono2017-08-301-0/+5
| | | | | | | |
| * | | | | | | Default LDAP config verify_certificates to trueMichael Kozono2017-08-303-18/+13
| | | | | | | |
* | | | | | | | Merge branch 'feature/gb/add-complex-jobs-only-except-config-policy' into ↵Kamil Trzciński2017-08-3117-152/+330
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' New syntax for CI/CD job triggering policy that supports variables expressions See merge request !13769
| * | | | | | | | Remove unused expressions policy from ci/cd configfeature/gb/add-complex-jobs-only-except-config-policyGrzegorz Bizon2017-08-302-39/+0
| | | | | | | | |
| * | | | | | | | Simplify code for appending strategies in CI/CD configGrzegorz Bizon2017-08-301-2/+2
| | | | | | | | |
| * | | | | | | | Raise exception when simplifiable ci entry incompleteGrzegorz Bizon2017-08-302-0/+17
| | | | | | | | |
| * | | | | | | | Fix rubocop offense in YAML processor specsGrzegorz Bizon2017-08-261-1/+0
| | | | | | | | |
| * | | | | | | | Add specs for attributable aspect of ci config entryGrzegorz Bizon2017-08-252-6/+25
| | | | | | | | |
| * | | | | | | | Fix Rubocop offense in CI/CD only/except policy classGrzegorz Bizon2017-08-251-1/+1
| | | | | | | | |
| * | | | | | | | Improve reporting of a CI/CD entry config locationGrzegorz Bizon2017-08-257-31/+36
| | | | | | | | |
| * | | | | | | | Simplify ci config entry validator implementationGrzegorz Bizon2017-08-251-7/+2
| | | | | | | | |
| * | | | | | | | Use only/except policy that returns an arrayGrzegorz Bizon2017-08-252-5/+1
| | | | | | | | |
| * | | | | | | | Fix CI/CD trigger policy default valueGrzegorz Bizon2017-08-252-0/+9
| | | | | | | | |
| * | | | | | | | Add specs for a simplifiable CI/CD entry aspectGrzegorz Bizon2017-08-251-0/+75
| | | | | | | | |
| * | | | | | | | Implement complex only/except policy CI/CD configGrzegorz Bizon2017-08-253-4/+54
| | | | | | | | |
| * | | | | | | | Make it possible to define CI/CD config strategiesGrzegorz Bizon2017-08-253-35/+88
| | | | | | | | |
| * | | | | | | | Use aspect-oriented design in CI/CD config entriesGrzegorz Bizon2017-08-246-37/+36
| | | | | | | | |
| * | | | | | | | Rename CI/CD job triggering policy class to PolicyGrzegorz Bizon2017-08-243-5/+5
| | | | | | | | |
* | | | | | | | | Merge branch 'fly-out-nav-jump-fix' into 'master'Tim Zallmann2017-08-312-31/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed fly-out nav jumping Closes #36699 See merge request !13690
| * | | | | | | | | Fixed fly-out nav jumpingfly-out-nav-jump-fixPhil Hughes2017-08-192-31/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #36699