summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add Changelog entry for missing artifacts in browser fixfix/bump-workhorse-versionGrzegorz Bizon2016-01-261-0/+3
* Bump Workhorse version to 0.6.2Grzegorz Bizon2016-01-261-1/+1
* Merge branch 'monkey_patch' into 'master' Dmitriy Zaporozhets2016-01-261-0/+48
|\
| * monkey patch for mysql 5.7monkey_patchValery Sizov2016-01-251-0/+48
* | Merge branch 'using-a-or-m-hotkeys-on-issuable-tab' into 'master' Dmitriy Zaporozhets2016-01-261-2/+2
|\ \
| * | Clicks the edit button instead of opening the dropdownusing-a-or-m-hotkeys-on-issuable-tabJacob Schatz2016-01-251-2/+2
* | | Merge branch 'visibility-level-text-admin-area' into 'master' Douwe Maan2016-01-262-2/+3
|\ \ \
| * | | Fix visibility level texts on application settingsZeger-Jan van de Weg2016-01-262-2/+3
|/ / /
* | | Merge branch 'save-button-color-application-settings' into 'master' Douwe Maan2016-01-263-4/+3
|\ \ \
| * | | Save button on app settings now btn-saveZeger-Jan van de Weg2016-01-263-4/+3
* | | | Merge branch 'track-project-import-failure' into 'master' Douwe Maan2016-01-266-64/+222
|\ \ \ \
| * | | | Update CHANGELOGtrack-project-import-failureDouglas Barbosa Alexandre2016-01-261-0/+1
| * | | | Wrap errors on GitHub importer to raise Projects::ImportService::ErrorDouglas Barbosa Alexandre2016-01-262-7/+12
| * | | | Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre2016-01-262-22/+29
| * | | | Extract Projects::ImportService service from RepositoryImportWorkerDouglas Barbosa Alexandre2016-01-253-39/+184
* | | | | Merge branch 'ci/test-build-artifacts-scripts' into 'master' Douwe Maan2016-01-262-0/+19
|\ \ \ \ \
| * | | | | Add tests for clicking a row in build artifacts browserci/test-build-artifacts-scriptsGrzegorz Bizon2016-01-222-0/+19
* | | | | | Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-262-1/+10
|\ \ \ \ \ \
| * | | | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-242-1/+10
* | | | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-262-4/+28
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-232-4/+28
* | | | | | | Merge branch 'patch-1' into 'master' Stan Hu2016-01-261-5/+7
|\ \ \ \ \ \ \
| * | | | | | | Update Slack integration configurationMarcin ZajÄ…czkowski2016-01-251-5/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Update CHANGELOGRobert Speicher2016-01-251-0/+6
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-262-5/+124
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-252-5/+124
* | | | | | Merge branch 'instrumentation-signature' into 'master' Douglas Barbosa Alexandre2016-01-262-3/+29
|\ \ \ \ \ \
| * | | | | | Correct arity for instrumented methods w/o argsinstrumentation-signatureYorick Peterse2016-01-252-3/+29
| |/ / / / /
* | | | | | Merge branch 'note-highlighting' into 'master' Robert Speicher2016-01-2516-64/+34
|\ \ \ \ \ \
| * | | | | | Highlight note code and edit previewnote-highlightingDouwe Maan2016-01-2516-64/+34
* | | | | | | Merge branch 'rs-rails-security' into 'master' Robert Speicher2016-01-253-35/+42
|\ \ \ \ \ \ \
| * | | | | | | Add temporary monkey patch to get specs passing on 4.2.5.1Robert Speicher2016-01-251-0/+6
| * | | | | | | Update rails, rails-html-sanitizer, and nokogiri for security fixesrs-rails-securityRobert Speicher2016-01-252-35/+36
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'doc_refactor_jira' into 'master' Achilleas Pipinellis2016-01-2523-151/+217
|\ \ \ \ \ \ \
| * | | | | | | Add minimum required GitLab versionAchilleas Pipinellis2016-01-251-3/+6
| * | | | | | | Remove old JIRA referenceAchilleas Pipinellis2016-01-252-52/+2
| * | | | | | | Fix typos, grammar and stylingAchilleas Pipinellis2016-01-253-19/+14
| * | | | | | | Add proper screenshot and comment on the outputdoc_refactor_jiraAchilleas Pipinellis2016-01-253-5/+14
| * | | | | | | Fix sub-headingAchilleas Pipinellis2016-01-251-1/+1
| * | | | | | | JIRA doc clean-up [ci skip]Achilleas Pipinellis2016-01-255-50/+94
| * | | | | | | Add steps on configuring JIRAAchilleas Pipinellis2016-01-257-13/+62
| * | | | | | | Split JIRA configuration for GitLab < 7.8 and > 7.8Achilleas Pipinellis2016-01-252-0/+162
| * | | | | | | Move JIRA from integration to project_servicesAchilleas Pipinellis2016-01-2511-151/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mention_rouge_in_docs' into 'master' Sytse Sijbrandij2016-01-252-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Add references to the rouge gem libraryAchilleas Pipinellis2016-01-252-0/+10
* | | | | | | | Merge branch 'prioritize-previewable-over-plain-readmes' into 'master' Robert Speicher2016-01-252-4/+76
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-252-4/+76
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rm-depr-forum-promolink' into 'master' Robert Speicher2016-01-251-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Substituted deprecated forum link with project issues link. [ci skip]Jose Torres2016-01-251-3/+3
|/ / / / / /
* | | | | | Merge branch 'top-search-colors-and-element-position-is-not-like-in-design' i...Jacob Schatz2016-01-258-20/+50
|\ \ \ \ \ \ | |/ / / / / |/| | | | |