Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add Changelog entry for missing artifacts in browser fixfix/bump-workhorse-version | Grzegorz Bizon | 2016-01-26 | 1 | -0/+3 |
* | Bump Workhorse version to 0.6.2 | Grzegorz Bizon | 2016-01-26 | 1 | -1/+1 |
* | Merge branch 'monkey_patch' into 'master' | Dmitriy Zaporozhets | 2016-01-26 | 1 | -0/+48 |
|\ | |||||
| * | monkey patch for mysql 5.7monkey_patch | Valery Sizov | 2016-01-25 | 1 | -0/+48 |
* | | Merge branch 'using-a-or-m-hotkeys-on-issuable-tab' into 'master' | Dmitriy Zaporozhets | 2016-01-26 | 1 | -2/+2 |
|\ \ | |||||
| * | | Clicks the edit button instead of opening the dropdownusing-a-or-m-hotkeys-on-issuable-tab | Jacob Schatz | 2016-01-25 | 1 | -2/+2 |
* | | | Merge branch 'visibility-level-text-admin-area' into 'master' | Douwe Maan | 2016-01-26 | 2 | -2/+3 |
|\ \ \ | |||||
| * | | | Fix visibility level texts on application settings | Zeger-Jan van de Weg | 2016-01-26 | 2 | -2/+3 |
|/ / / | |||||
* | | | Merge branch 'save-button-color-application-settings' into 'master' | Douwe Maan | 2016-01-26 | 3 | -4/+3 |
|\ \ \ | |||||
| * | | | Save button on app settings now btn-save | Zeger-Jan van de Weg | 2016-01-26 | 3 | -4/+3 |
* | | | | Merge branch 'track-project-import-failure' into 'master' | Douwe Maan | 2016-01-26 | 6 | -64/+222 |
|\ \ \ \ | |||||
| * | | | | Update CHANGELOGtrack-project-import-failure | Douglas Barbosa Alexandre | 2016-01-26 | 1 | -0/+1 |
| * | | | | Wrap errors on GitHub importer to raise Projects::ImportService::Error | Douglas Barbosa Alexandre | 2016-01-26 | 2 | -7/+12 |
| * | | | | Move Gitlab::BitbucketImport::KeyDeleter to it's own importer | Douglas Barbosa Alexandre | 2016-01-26 | 2 | -22/+29 |
| * | | | | Extract Projects::ImportService service from RepositoryImportWorker | Douglas Barbosa Alexandre | 2016-01-25 | 3 | -39/+184 |
* | | | | | Merge branch 'ci/test-build-artifacts-scripts' into 'master' | Douwe Maan | 2016-01-26 | 2 | -0/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Add tests for clicking a row in build artifacts browserci/test-build-artifacts-scripts | Grzegorz Bizon | 2016-01-22 | 2 | -0/+19 |
* | | | | | | Merge branch 'rs-issue-12677' into 'master' | Douwe Maan | 2016-01-26 | 2 | -1/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677 | Robert Speicher | 2016-01-24 | 2 | -1/+10 |
* | | | | | | | Merge branch 'rs-groups-index' into 'master' | Douwe Maan | 2016-01-26 | 2 | -4/+28 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Make the `/groups` route behave as expectedrs-groups-index | Robert Speicher | 2016-01-23 | 2 | -4/+28 |
* | | | | | | | Merge branch 'patch-1' into 'master' | Stan Hu | 2016-01-26 | 1 | -5/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update Slack integration configuration | Marcin ZajÄ…czkowski | 2016-01-25 | 1 | -5/+7 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Update CHANGELOG | Robert Speicher | 2016-01-25 | 1 | -0/+6 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch 'fix-import-redirect-loop' into 'master' | Robert Speicher | 2016-01-26 | 2 | -5/+124 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fixi import redirect loop | Douglas Barbosa Alexandre | 2016-01-25 | 2 | -5/+124 |
* | | | | | | Merge branch 'instrumentation-signature' into 'master' | Douglas Barbosa Alexandre | 2016-01-26 | 2 | -3/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correct arity for instrumented methods w/o argsinstrumentation-signature | Yorick Peterse | 2016-01-25 | 2 | -3/+29 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'note-highlighting' into 'master' | Robert Speicher | 2016-01-25 | 16 | -64/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Highlight note code and edit previewnote-highlighting | Douwe Maan | 2016-01-25 | 16 | -64/+34 |
* | | | | | | | Merge branch 'rs-rails-security' into 'master' | Robert Speicher | 2016-01-25 | 3 | -35/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add temporary monkey patch to get specs passing on 4.2.5.1 | Robert Speicher | 2016-01-25 | 1 | -0/+6 |
| * | | | | | | | Update rails, rails-html-sanitizer, and nokogiri for security fixesrs-rails-security | Robert Speicher | 2016-01-25 | 2 | -35/+36 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'doc_refactor_jira' into 'master' | Achilleas Pipinellis | 2016-01-25 | 23 | -151/+217 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add minimum required GitLab version | Achilleas Pipinellis | 2016-01-25 | 1 | -3/+6 |
| * | | | | | | | Remove old JIRA reference | Achilleas Pipinellis | 2016-01-25 | 2 | -52/+2 |
| * | | | | | | | Fix typos, grammar and styling | Achilleas Pipinellis | 2016-01-25 | 3 | -19/+14 |
| * | | | | | | | Add proper screenshot and comment on the outputdoc_refactor_jira | Achilleas Pipinellis | 2016-01-25 | 3 | -5/+14 |
| * | | | | | | | Fix sub-heading | Achilleas Pipinellis | 2016-01-25 | 1 | -1/+1 |
| * | | | | | | | JIRA doc clean-up [ci skip] | Achilleas Pipinellis | 2016-01-25 | 5 | -50/+94 |
| * | | | | | | | Add steps on configuring JIRA | Achilleas Pipinellis | 2016-01-25 | 7 | -13/+62 |
| * | | | | | | | Split JIRA configuration for GitLab < 7.8 and > 7.8 | Achilleas Pipinellis | 2016-01-25 | 2 | -0/+162 |
| * | | | | | | | Move JIRA from integration to project_services | Achilleas Pipinellis | 2016-01-25 | 11 | -151/+5 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mention_rouge_in_docs' into 'master' | Sytse Sijbrandij | 2016-01-25 | 2 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add references to the rouge gem library | Achilleas Pipinellis | 2016-01-25 | 2 | -0/+10 |
* | | | | | | | | Merge branch 'prioritize-previewable-over-plain-readmes' into 'master' | Robert Speicher | 2016-01-25 | 2 | -4/+76 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmes | Douglas Barbosa Alexandre | 2016-01-25 | 2 | -4/+76 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'rm-depr-forum-promolink' into 'master' | Robert Speicher | 2016-01-25 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Substituted deprecated forum link with project issues link. [ci skip] | Jose Torres | 2016-01-25 | 1 | -3/+3 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'top-search-colors-and-element-position-is-not-like-in-design' i... | Jacob Schatz | 2016-01-25 | 8 | -20/+50 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |