Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix rendering emoji inside a string | blackst0ne | 2017-04-25 | 8 | -7/+66 |
| | |||||
* | Merge branch 'docs-topic-auth' into 'master' | Marcia Ramos | 2017-04-12 | 2 | -1/+47 |
|\ | | | | | | | | | | | | | Documentation topic: Authentication Closes #30744 See merge request !10608 | ||||
| * | fix conflictdocs-topic-auth | Marcia Ramos | 2017-04-11 | 59 | -215/+829 |
| |\ | |||||
| * | | typo | Marcia Ramos | 2017-04-10 | 1 | -1/+1 |
| | | | |||||
| * | | fix typo | Marcia Ramos | 2017-04-10 | 1 | -1/+1 |
| | | | |||||
| * | | fix links | Marcia Ramos | 2017-04-10 | 1 | -2/+2 |
| | | | |||||
| * | | add topic: authentication | Marcia Ramos | 2017-04-10 | 2 | -2/+48 |
| | | | |||||
* | | | Merge branch 'dm-outdated-diff-link' into 'master' | Sean McGivern | 2017-04-11 | 25 | -82/+226 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572 | ||||
| * | | | Statisfy Robertcop and Seancopdm-outdated-diff-link | Douwe Maan | 2017-04-11 | 2 | -10/+4 |
| | | | | |||||
| * | | | Add specs | Douwe Maan | 2017-04-10 | 5 | -2/+98 |
| | | | | |||||
| * | | | Fix specs | Douwe Maan | 2017-04-09 | 3 | -5/+8 |
| | | | | |||||
| * | | | Some code tweaks | Douwe Maan | 2017-04-08 | 8 | -18/+21 |
| | | | | |||||
| * | | | Fix views after rebase | Douwe Maan | 2017-04-08 | 2 | -3/+5 |
| | | | | |||||
| * | | | Fix find_by_diff_refs | Douwe Maan | 2017-04-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix specs and make tweaks | Douwe Maan | 2017-04-08 | 7 | -39/+50 |
| | | | | |||||
| * | | | Change discussion headline to 'a now outdated portion of the diff' | Douwe Maan | 2017-04-08 | 1 | -4/+3 |
| | | | | |||||
| * | | | Add link to diff header too | Douwe Maan | 2017-04-08 | 2 | -14/+16 |
| | | | | |||||
| * | | | Cache MR diffs by diff refs | Douwe Maan | 2017-04-08 | 2 | -1/+11 |
| | | | | |||||
| * | | | Link to outdated diff in older MR version from outdated diff discussion | Douwe Maan | 2017-04-08 | 15 | -39/+63 |
| | | | | |||||
* | | | | Merge branch '28017-separate-ce-params-on-api' into 'master' | Douwe Maan | 2017-04-11 | 8 | -30/+122 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API: Separate CE params to avoid wrong conflict resolutions" Closes #28017 See merge request !10484 | ||||
| * | | | | Add share_with_group_lock to CE optional params block28017-separate-ce-params-on-api | Oswaldo Ferreira | 2017-04-10 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Separate CE params on Grape API | Oswaldo Ferreira | 2017-04-10 | 8 | -30/+121 |
| | | | | | |||||
* | | | | | Merge branch 'removed-notebooklab-absolute-paths' into 'master' | Jacob Schatz | 2017-04-11 | 1 | -215/+32 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed notebooklab code including file paths See merge request !10629 | ||||
| * | | | | | Fixed notebooklab code including file pathsremoved-notebooklab-absolute-paths | Phil Hughes | 2017-04-11 | 1 | -215/+32 |
| | | | | | | |||||
* | | | | | | Merge branch 'update-doc-installation-and-upgrade' into 'master' | Robert Speicher | 2017-04-11 | 2 | -7/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation and upgrading guides [ci skip] See merge request !10621 | ||||
| * | | | | | | Update documents according to:update-doc-installation-and-upgrade | Lin Jen-Shin | 2017-04-11 | 2 | -7/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#step-1-update-the-installation-from-source-guide In step 1 and step 2 | ||||
* | | | | | | | Merge branch '30636-fix-blame-edit-blob-without-repo-permissions' into 'master' | Annabel Dunstone Gray | 2017-04-11 | 2 | -7/+7 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Edit" button on blame page without repo permissions Closes #30636 See merge request !10598 | ||||
| * | | | | | | | Fix edit button on blame page without repo perms30636-fix-blame-edit-blob-without-repo-permissions | Eric Eastwood | 2017-04-10 | 2 | -7/+7 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without repo permissions, pressing the "Edit" button on the blame page will now prompt to Fork/Cancel. Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30636 | ||||
* | | | | | | | Merge branch 'update-licenses.csv' into 'master' | Robert Speicher | 2017-04-11 | 1 | -146/+322 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update licenses.csv [ci skip] See merge request !10620 | ||||
| * | | | | | | Update licenses.csv via:update-licenses.csv | Lin Jen-Shin | 2017-04-11 | 1 | -146/+322 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | license_finder report --format=csv --save=vendor/licenses.csv | ||||
* | | | | | | | Merge branch 'gitlab-update_templates' into 'master' | Robert Speicher | 2017-04-11 | 14 | -70/+68 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates See merge request !10619 | ||||
| * | | | | | | | Update templates via:gitlab-update_templates | Lin Jen-Shin | 2017-04-11 | 14 | -70/+68 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | rake gitlab:update_templates | ||||
* | | | | | | | Merge branch 'new-git-index' into 'master' | Marcia Ramos | 2017-04-11 | 2 | -4/+64 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | New git index See merge request !10349 | ||||
| * | | | | | | Axil's reviewnew-git-index | Marcia Ramos | 2017-04-11 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | remove unnecessary line | Marcia Ramos | 2017-04-11 | 1 | -3/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into new-git-index | Marcia Ramos | 2017-04-11 | 1402 | -10462/+80811 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | replace relative urls - html to md | Marcia Ramos | 2017-03-30 | 1 | -8/+8 |
| | | | | | | | | |||||
| * | | | | | | | fix heading | Marcia Ramos | 2017-03-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | add intro, move version control to getting started | Marcia Ramos | 2017-03-30 | 1 | -6/+14 |
| | | | | | | | | |||||
| * | | | | | | | add general info, fix links | Marcia Ramos | 2017-03-30 | 1 | -8/+16 |
| | | | | | | | | |||||
| * | | | | | | | add Git index | Marcia Ramos | 2017-03-30 | 1 | -0/+46 |
| | | | | | | | | |||||
| * | | | | | | | add Git topic, reorder topics alphabetically | Marcia Ramos | 2017-03-30 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'rs-remove-open-for-scope' into 'master' test-branch-name | Douwe Maan | 2017-04-11 | 4 | -16/+0 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused scopes See merge request !10609 | ||||
| * | | | | | | | | Remove an unused `cared` scope from Issue and MergeRequestrs-remove-open-for-scope | Robert Speicher | 2017-04-10 | 3 | -6/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove an unused `Issue.open_for` scope | Robert Speicher | 2017-04-10 | 2 | -10/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'zj-fk-ci-triggers' into 'master' | Yorick Peterse | 2017-04-11 | 4 | -1/+22 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add foreign key on trigger requests See merge request !10537 | ||||
| * | | | | | | | | | Add foreign key on trigger requestszj-fk-ci-triggers | Z.J. van de Weg | 2017-04-11 | 4 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I started out as I missed the foreign key on ci_triggers and projects. However, it seemed Yorick caught this already on gitlab-org/gitlab-ce!9388. Still I found a missing foreign key, between the trigger requests and triggers. This commit adds it, and removes the depend: :destroy on the Rails model Ci::Triggers | ||||
* | | | | | | | | | | Merge branch 'dz-fix-project-view' into 'master' | Annabel Dunstone Gray | 2017-04-11 | 6 | -4/+56 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change project view default for existing users and anonymous visitors to files+readme Closes #29926 See merge request !10498 | ||||
| * | | | | | | | | | Change project view default for existing users and anonymous visitors to ↵dz-fix-project-view | Dmitriy Zaporozhets | 2017-04-10 | 6 | -4/+56 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | | | Merge branch 'signed-out-menu-shortcuts' into 'master' | Jacob Schatz | 2017-04-11 | 2 | -16/+51 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Added keyboard shortcuts to signed out menu See merge request !10526 |