summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into repo-bugsrepo-bugsLuke "Jared" Bennett2017-08-31124-803/+1667
|\
| * Merge branch 'winh-merge-request-version-dropdowns' into 'master'Phil Hughes2017-08-311-0/+2
| |\
| | * 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 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 testsremove-unnecessary-console-logMike Greiling2017-08-301-1/+0
| * | | Merge branch 'mk-default-ldap-verify-certificates-secure' into 'master'Douwe Maan2017-08-314-18/+18
| |\ \ \
| | * | | 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 'ma...Kamil TrzciƄski2017-08-3117-152/+330
| |\ \ \ \
| | * | | | 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 jumpingfly-out-nav-jump-fixPhil Hughes2017-08-192-31/+16
| * | | | | | Merge branch 'fix/gem-security-updates' into 'master'Robert Speicher2017-08-314-30/+33
| |\ \ \ \ \ \
| | * | | | | | Upgrade mail and nokogiri gems due to security issuesMarkus Koller2017-08-314-30/+33
| |/ / / / / /
| * | | | | | Merge branch 'swappiness-req-doc' into 'master'Stan Hu2017-08-311-1/+3
| |\ \ \ \ \ \
| | * | | | | | Link out to stackoverflow answer on setting swappinessDJ Mountney2017-08-301-3/+3
| | * | | | | | Document swappiness recomendations in the requirements docDJ Mountney2017-08-301-1/+3
| |/ / / / / /
| * | | | | | Merge branch 'refactor-prometheus-graph-layout' into 'master'Fatih Acet2017-08-3016-131/+127
| |\ \ \ \ \ \
| | * | | | | | update specs to match reorganized monitoring componentsrefactor-prometheus-graph-layoutMike Greiling2017-08-307-36/+39
| | * | | | | | extract prometheus graph group elements into their own componentMike Greiling2017-08-302-16/+34
| | * | | | | | remove pointless single-row/single-col wrapperMike Greiling2017-08-291-16/+12
| | * | | | | | rename and organize vue componentsMike Greiling2017-08-298-32/+31
| | * | | | | | refactor template formatting according to guidelinesMike Greiling2017-08-293-52/+32
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'winh-new-project-dropdowns' into 'master'Clement Ho2017-08-301-0/+1
| |\ \ \ \ \ \
| | * | | | | | Make namespace dropdown on new project page consistentwinh-new-project-dropdownswinh2017-08-301-0/+1
| | |/ / / / /
| * | | | | | Merge branch 'dropdown-z-index-update' into 'master'Filipa Lacerda2017-08-301-1/+1
| |\ \ \ \ \ \
| | * | | | | | Increase z-index of dropdownsdropdown-z-index-updatePhil Hughes2017-08-291-1/+1
| * | | | | | | Merge branch 'fix-timeago-tooltip-attribute' into 'master'Filipa Lacerda2017-08-302-1/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Fix invalid attribute used for time-ago-tooltip componentClement Ho2017-08-302-1/+11
| |/ / / / / / /
| * | | | | | | Merge branch 'docs-improve-latest-artifacts' into 'master'Marcia Ramos2017-08-301-6/+11
| |\ \ \ \ \ \ \
| | * | | | | | | Update latest artifacts docFabio Busatto2017-08-301-6/+11
| |/ / / / / / /
| * | | | | | | Merge branch '36807-gc-unwanted-refs-after-import' into 'master'Douwe Maan2017-08-3013-14/+194
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 36807-gc-unwanted-refs-af...Lin Jen-Shin2017-08-3121-319/+310
| | |\ \ \ \ \ \ \
| | * | | | | | | | Use `git update-ref --stdin -z` to delete refs36807-gc-unwanted-refs-after-importLin Jen-Shin2017-08-305-5/+53