summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Hide overflow-x on collapsed sidebar36270-collapsed-sidebar-scrollAnnabel Dunstone Gray2017-08-101-0/+1
* Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'Robert Speicher2017-08-0982-168/+169
|\
| * Fix ee_compat_check when EE branch uses a prefixRémy Coutable2017-08-091-2/+3
| * Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-0981-166/+166
* | Merge branch '35996-icon-hover-color' into 'master'Phil Hughes2017-08-091-0/+4
|\ \
| * | Update icon color on hover35996-icon-hover-colorAnnabel Dunstone Gray2017-08-081-0/+4
* | | Merge branch 'mr-changes-container-full-width' into 'master'Annabel Dunstone Gray2017-08-092-15/+16
|\ \ \
| * | | Fixed merge request changes sticky container not spreading full widthmr-changes-container-full-widthPhil Hughes2017-08-082-15/+16
* | | | Merge branch '36179-align-nav-items' into 'master'Phil Hughes2017-08-091-1/+2
|\ \ \ \
| * | | | Align all nav items in sidebar36179-align-nav-itemsAnnabel Dunstone Gray2017-08-081-1/+2
| | |/ / | |/| |
* | | | Merge branch 'fix-collapsed-sidebar-item-height' into 'master'Phil Hughes2017-08-091-2/+5
|\ \ \ \
| * | | | Fix height of collapsed sidebar itemsfix-collapsed-sidebar-item-heightAnnabel Dunstone Gray2017-08-081-2/+5
| |/ / /
* | | | Merge branch 'dz-clarify-constrainer-query' into 'master'Sean McGivern2017-08-091-0/+2
|\ \ \ \
| * | | | Explain why we use select all for project_url_constrainer.rbDmitriy Zaporozhets2017-08-091-0/+2
* | | | | Merge branch 'pikaday-undefined-fix' into 'master'Tim Zallmann2017-08-094-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix pikaday being undefinedPhil Hughes2017-08-094-5/+5
* | | | | Merge branch '36119-issuable-workers' into 'master'Sean McGivern2017-08-096-13/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Simplify checking if objects exist code in new issaubles workers36119-issuable-workersJarka Kadlecova2017-08-086-13/+22
* | | | | Merge branch 'bvl-port-storage-spec-helpers-from-ee' into 'master'Sean McGivern2017-08-091-0/+11
|\ \ \ \ \
| * | | | | Add a helper to stub storage settings with defaultsbvl-port-storage-spec-helpers-from-eeBob Van Landuyt2017-08-091-0/+11
* | | | | | Merge branch 'update-installation-docs-9-5' into 'master'Achilleas Pipinellis2017-08-091-2/+2
|\ \ \ \ \ \
| * | | | | | update Install from Source instructionsSimon Knox2017-08-091-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'ask-for-exceptions-in-advance' into 'master'Rémy Coutable2017-08-091-10/+27
|\ \ \ \ \ \
| * | | | | | Translations can be picked without asking for exceptionsSean McGivern2017-08-091-5/+12
| * | | | | | Ask for exceptions in advanceSean McGivern2017-08-091-5/+15
| |/ / / / /
* | | | | | Merge branch 'rc/cob-do-not-require-stackprof' into 'master'Sean McGivern2017-08-092-2/+3
|\ \ \ \ \ \
| * | | | | | Don't require stackprof in GemfileRémy Coutable2017-08-092-2/+3
| |/ / / / /
* | | | | | Merge branch 'update-source-install-docs-with-i18n' into 'master'Rémy Coutable2017-08-095-9/+37
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update docs with i18n info for source installationsupdate-source-install-docs-with-i18nRubén Dávila2017-08-085-9/+37
* | | | | | Merge branch '34339-user_avatar-url-in-push-event-webhook-json-payload-is-rel...Rémy Coutable2017-08-092-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-092-1/+5
| | |_|/ / | |/| | |
* | | | | Merge branch 'synchronous_korean_translation_in_zanata' into 'master'Rémy Coutable2017-08-091-8/+11
|\ \ \ \ \
| * | | | | Synchronous Korean translation in zanata黄涛2017-08-091-8/+11
| |/ / / /
* | | | | Merge branch 'patch-24' into 'master'Achilleas Pipinellis2017-08-091-1/+1
|\ \ \ \ \
| * | | | | Update README.md with a more flexible sentencePaolo Falomo2017-08-071-1/+1
| * | | | | there are 3 dots but it says four products. fixed Paolo Falomo2017-07-271-1/+1
* | | | | | Merge branch 'docs-invalid-json-examples-for-system-hooks' into 'master'Achilleas Pipinellis2017-08-091-7/+7
|\ \ \ \ \ \
| * | | | | | Remove trailing comma in System Hooks payload examplesMark Fletcher2017-08-081-7/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sh-structured-log-docs' into 'master'Achilleas Pipinellis2017-08-091-0/+27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add docs on structured logging in GitLabsh-structured-log-docsStan Hu2017-08-081-0/+27
* | | | | | Merge branch 'winh-restore-blob-fixture' into 'master'Filipa Lacerda2017-08-081-0/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Restore blob fixture for JavaScript testswinh-restore-blob-fixturewinh2017-08-081-0/+29
|/ / / / /
* | | | | Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-4/+4
* | | | | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0834-48/+90
|\ \ \ \ \
| * | | | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0834-48/+90
* | | | | | Merge branch 'fly-out-nav-collapsed' into 'master'Annabel Dunstone Gray2017-08-083-9/+78
|\ \ \ \ \ \
| * | | | | | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-083-9/+78
|/ / / / / /
* | | | | | Merge branch '36168-fix-transient-preferences-specs' into 'master'Sean McGivern2017-08-081-12/+16
|\ \ \ \ \ \
| * | | | | | Fix Profile > Preferences feature specs36168-fix-transient-preferences-specsRémy Coutable2017-08-081-12/+16
| |/ / / / /
* | | | | | Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz2017-08-084-27/+4
|\ \ \ \ \ \
View Lorry Controller Status