summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Run migration specs separately as part of the `migration:path-*` jobsrs-separate-migration-specsRobert Speicher2017-09-111-3/+4
* Merge branch 'sh-filter-runner-token' into 'master'Robert Speicher2017-09-111-2/+2
|\
| * Expand filtered parameters to include `token`sh-filter-runner-tokenStan Hu2017-09-101-2/+2
* | Merge branch '37647-follow-up-from-update-helm-chart-docs-from-ce-docs' into ...Achilleas Pipinellis2017-09-111-2/+2
|\ \
| * | Fix links37647-follow-up-from-update-helm-chart-docs-from-ce-docsJoshua Lambert2017-09-082-6/+6
| * | Fix linksJoshua Lambert2017-09-083-9/+9
| * | Make links relativeJoshua Lambert2017-09-084-14/+14
* | | Merge branch 'replace_emails.feature' into 'master'Rémy Coutable2017-09-114-74/+83
|\ \ \
| * | | Replace the profile/emails.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-104-74/+83
| | |/ | |/|
* | | Merge branch 'replace_team_management.feature' into 'master'Rémy Coutable2017-09-114-113/+73
|\ \ \
| * | | Replace the project/team_management.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-104-113/+73
| |/ /
* | | Merge branch '37644-update-prometheus-metric-library-to-support-multiple-seri...Tim Zallmann2017-09-115-18/+60
|\ \ \
| * | | update ingress doc37644-update-prometheus-metric-library-to-support-multiple-series-and-colorsJoshua Lambert2017-09-091-1/+1
| * | | Fix ingress queryJoshua Lambert2017-09-091-2/+3
| * | | Update k8s metrics and docsJoshua Lambert2017-09-082-2/+2
| * | | Update queries for colors and seriesJoshua Lambert2017-09-085-18/+59
* | | | Merge branch 'import-sources-fix' into 'master'Rémy Coutable2017-09-113-2/+7
|\ \ \ \
| * | | | Read import sources from setting at first initializationVisay Keo2017-09-093-2/+7
| | |/ / | |/| |
* | | | Merge branch 'changes-tab-jumping' into 'master'Filipa Lacerda2017-09-112-1/+6
|\ \ \ \
| * | | | Fixed changes bar jumping on merge requestschanges-tab-jumpingPhil Hughes2017-09-082-1/+6
* | | | | Merge branch 'user-recent-push' into 'master'Douwe Maan2017-09-1113-86/+369
|\ \ \ \ \
| * | | | | Rework how recent push events are retrieveduser-recent-pushYorick Peterse2017-09-0813-86/+369
* | | | | | Merge branch 'feature/gpg-verification-status-remove-ignore-rule' into 'master'Douwe Maan2017-09-111-3/+0
|\ \ \ \ \ \
| * | | | | | Revert "make valid_signature an ignored column"Alexis Reigel2017-09-051-3/+0
* | | | | | | Merge branch '37603-preferences-settings-extra-line' into 'master'Phil Hughes2017-09-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove unused extra hr in preferences37603-preferences-settings-extra-lineAnnabel Dunstone Gray2017-09-081-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'file-content-mobile' into 'master'Phil Hughes2017-09-111-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Reduce top and bottom margin on file viewer on mobilefile-content-mobileAnnabel Dunstone Gray2017-09-081-2/+5
| |/ / / / / /
* | | | | | | Merge branch 'conv-dev-index-regression' into 'master'Phil Hughes2017-09-114-7/+12
|\ \ \ \ \ \ \
| * | | | | | | Correctly link ConvDev Index nav links to its controller.conv-dev-index-regressionBryce Johnson2017-09-084-7/+12
| |/ / / / / /
* | | | | | | Merge branch '37454-remove-confidential-cb-edit-issue' into 'master'Phil Hughes2017-09-117-62/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove confidential toggle checkbox and related code as no longer necessary37454-remove-confidential-cb-edit-issuekushalpandya2017-09-117-62/+0
* | | | | | | | Merge branch 'sidebar-expanded-large-screen' into 'master'Phil Hughes2017-09-115-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Check for sidebar cookie instead of class when resizing windowAnnabel Dunstone Gray2017-09-115-5/+5
|/ / / / / / /
* | | | | | | Merge branch 'sh-bump-grape-logging-for-status-codes' into 'master'Robert Speicher2017-09-102-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Bump grape_logging gem to 1.7.0 to get status codes for error messagessh-bump-grape-logging-for-status-codesStan Hu2017-09-102-3/+3
|/ / / / / /
* | | | | | Merge branch 'remove-bootlint' into 'master'Clement Ho2017-09-082-6/+0
|\ \ \ \ \ \
| * | | | | | Remove bootlint which takes 1 second of render time on developmentJacob Schatz2017-09-082-6/+0
|/ / / / / /
* | | | | | Merge branch 'sidebar-drop-shadow' into 'master'Annabel Dunstone Gray2017-09-082-0/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adds drop shadow to the expanded sidebarPhil Hughes2017-09-082-0/+12
|/ / / / /
* | | | | Merge branch 'revert-f2421b2b' into 'master'Robert Speicher2017-09-0833-648/+111
|\ \ \ \ \
| * | | | | Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-0833-648/+111
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix/ldap-typo-docs' into 'master'Achilleas Pipinellis2017-09-081-1/+1
|\ \ \ \ \
| * | | | | Update ldap.mdfix/ldap-typo-docsJames Lopez2017-09-081-1/+1
* | | | | | Merge branch 'docs-quick-fix' into 'master'Achilleas Pipinellis2017-09-083-6/+11
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | index project settings doc from other indexesMarcia Ramos2017-09-082-0/+5
| * | | | | copyeditMarcia Ramos2017-09-081-5/+5
| * | | | | fixes linkMarcia Ramos2017-09-081-1/+1
|/ / / / /
* | | | | Merge branch 'fix/gb/qa/new-navigation-support' into 'master'Rémy Coutable2017-09-081-10/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix GitLab QA for new navigation enabled by defaultfix/gb/qa/new-navigation-supportGrzegorz Bizon2017-09-081-10/+11