Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace www.gitlab.com with about.gitlab.com | Ciro Santilli | 2014-10-07 | 3 | -4/+12 |
| | |||||
* | Merge branch 'slack_integration' into 'master' | Dmitriy Zaporozhets | 2014-10-06 | 2 | -12/+11 |
|\ | | | | | | | | | | | Slack integration See merge request !1151 | ||||
| * | Add missing comma. | Marin Jankovski | 2014-10-06 | 1 | -1/+1 |
| | | |||||
| * | Accommodate new webhook url format. | Marin Jankovski | 2014-10-06 | 1 | -5/+7 |
| | | |||||
| * | Use only webhook for slack service integration. | Marin Jankovski | 2014-10-06 | 2 | -10/+7 |
| | | |||||
* | | Merge pull request #7964 from mr-vinn/task-lists | Marin Jankovski | 2014-10-06 | 15 | -7/+138 |
|\ \ | | | | | | | Add task lists to issues and merge requests | ||||
| * | | Add task lists to issues and merge requests | Vinnie Okada | 2014-10-05 | 15 | -7/+138 |
| |/ | | | | | | | | | | | | | | | Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a list item and turn it into a checkbox input. Users who can modify the issue or MR can toggle the checkboxes directly or edit the Markdown to manage the tasks. Task status is also displayed in the MR and issue lists. | ||||
* | | Protect from forgery with exception | Dmitriy Zaporozhets | 2014-10-06 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'improve-autolink' into 'master' | Dmitriy Zaporozhets | 2014-10-06 | 3 | -2/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Improve autolink Fixes #1649 See merge request !1155 | ||||
| * | | Use only escaped auto_link | Dmitriy Zaporozhets | 2014-10-06 | 3 | -2/+6 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Prevent PG::Error exception when check commit reference on commit | Dmitriy Zaporozhets | 2014-10-06 | 1 | -4/+9 |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge pull request #7379 from cirosantilli/remove-title | Dmitriy Zaporozhets | 2014-10-06 | 1 | -2/+1 |
|\ \ | |/ |/| | [minor-refactor] Remove unused title parameter on merge request creation helper. | ||||
| * | Remove unused title parameter. | Ciro Santilli | 2014-08-16 | 1 | -2/+1 |
| | | | | | | | | | | It is always overridden by to humanized source branch name by MergeRequests::BuilService, which is used by new_project_merge_request_path. | ||||
* | | Merge pull request #7933 from mr-vinn/cross-project-markdown | Marin Jankovski | 2014-10-05 | 2 | -6/+73 |
|\ \ | | | | | | | Implement cross-project Markdown references | ||||
| * | | Make Mentionables work for cross-project refs | Vinnie Okada | 2014-10-03 | 2 | -5/+72 |
| | | | | | | | | | | | | | | | Add a note to merge requests and issues when they're mentioned by a merge request, issue, or commit in another project. | ||||
| * | | Track projects in ReferenceExtractor | Vinnie Okada | 2014-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | Store both the project and identifier of extracted references. This prevents `ReferenceExtractor` from returning objects in the wrong project for cross-project references. | ||||
* | | | Fix fa-download icon | Sullivan SENECHAL | 2014-10-04 | 5 | -11/+11 |
| | | | |||||
* | | | Make nav links bold since some desktops does not render 500 properly | Dmitriy Zaporozhets | 2014-10-03 | 1 | -1/+1 |
| | | | |||||
* | | | Improve subnavigation style | Dmitriy Zaporozhets | 2014-10-03 | 1 | -33/+6 |
|/ / | |||||
* | | Add Pushover service integration | Sullivan SENECHAL | 2014-10-03 | 4 | -2/+122 |
| | | | | | | | | That introduce select field type for services options. | ||||
* | | Merge branch 'cirosantilli-factor-commit-msg-textarea' | Dmitriy Zaporozhets | 2014-10-03 | 7 | -37/+25 |
|\ \ | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/edit_tree/show.html.haml | ||||
| * \ | Merge branch 'factor-commit-msg-textarea' of ↵ | Dmitriy Zaporozhets | 2014-10-03 | 7 | -37/+25 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/blob/_remove.html.haml | ||||
| | * | | Factor commit message textareas. | Ciro Santilli | 2014-10-02 | 7 | -36/+25 |
| | | | | |||||
* | | | | Merge branch 'new-milestone-link' into 'master' | Dmitriy Zaporozhets | 2014-10-03 | 1 | -3/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New milestone and label links Fixes #1364 Fixes #1586 See merge request !1145 | ||||
| * | | | | New label link | Dmitriy Zaporozhets | 2014-10-02 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Add new milestone link. Hide empty milestone selectbox | Dmitriy Zaporozhets | 2014-10-02 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | Merge branch 'signin_after_confirmation' into 'master' | Dmitriy Zaporozhets | 2014-10-03 | 1 | -0/+17 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signin after confirmation Fixes #1471 See merge request !1146 | ||||
| * | | | | | Try signing in the user after user confirmation is correct and redirect to ↵ | Marin Jankovski | 2014-10-02 | 1 | -0/+17 |
| |/ / / / | | | | | | | | | | | | | | | | dashboard, otherwise redirect to signin page | ||||
* | | | | | Merge pull request #7934 from Soullivaneuh/font-awesome | Dmitriy Zaporozhets | 2014-10-03 | 135 | -278/+277 |
|\ \ \ \ \ | | | | | | | | | | | | | Upgrade to Font Awesome v4.2 | ||||
| * | | | | | Upgrade to Font Awesome v4.2 | Sullivan SENECHAL | 2014-10-03 | 135 | -278/+277 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #7779 from Bugagazavr/hook_tag_push_events | Dmitriy Zaporozhets | 2014-10-03 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Add tag push events to project hook api | ||||
| * | | | | | Add tag_push_events to project hook api | Kirill Zaitsev | 2014-10-03 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #7754 from Bugagazavr/hooks | Dmitriy Zaporozhets | 2014-10-03 | 6 | -11/+45 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | More information in merge request hook | ||||
| * | | | | | Hook attributes | Kirill Zaitsev | 2014-10-02 | 6 | -11/+45 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #7595 from bbodenmiller/patch-4 | Marin Jankovski | 2014-10-03 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | add sign-in count | ||||
| * | | | | | add sign-in count | Ben Bodenmiller | 2014-08-24 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | add sign-in count to admin section profile view | ||||
* | | | | | | Merge pull request #7748 from yglukhov/clickable-source-repo-in-mr | Marin Jankovski | 2014-10-03 | 1 | -1/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Source repo is now clickable. | ||||
| * | | | | | | Source repo is now clickable. | uran | 2014-09-12 | 1 | -1/+6 |
| | | | | | | | |||||
* | | | | | | | Add parenthesis to function def with arguments. | Ciro Santilli | 2014-10-03 | 23 | -47/+47 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #7922 from ↵ | Robert Schilling | 2014-10-03 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cirosantilli/improve-remove-file-commit-placeholder Improve remove file oommit message textarea placeholder. | ||||
| * | | | | | | Improve remove file textarea placeholder. | Ciro Santilli | 2014-09-30 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'show-build-coverage-in-mr' into 'master' | Dmitriy Zaporozhets | 2014-10-02 | 4 | -5/+37 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show build coverage in MR  See merge request !1148 | ||||
| * | | | | | | | Show test coverage results in MR if available | Dmitriy Zaporozhets | 2014-10-02 | 4 | -5/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | | Fix 500 error on admin user page | Dmitriy Zaporozhets | 2014-10-02 | 1 | -1/+1 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | Merge branch 'feature/zen_for_gfm' of github.com:Razer6/gitlabhq into ↵ | Marin Jankovski | 2014-10-02 | 5 | -13/+27 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Razer6-feature/zen_for_gfm Conflicts: CHANGELOG | ||||
| * | | | | | | Apply ZEN mode to all GFM forms | Robert Schilling | 2014-10-02 | 5 | -13/+27 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'factor-issue-mr-form-label' of ↵ | Dmitriy Zaporozhets | 2014-10-02 | 4 | -33/+22 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/cirosantilli/gitlabhq Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/merge_requests/_form.html.haml | ||||
| * | | | | | | Factor issue and edit MR form label field and submit. | Ciro Santilli | 2014-09-22 | 4 | -34/+22 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7921 from cirosantilli/improve-new-file-commit-placeholder | Robert Schilling | 2014-10-02 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improve new file commit message textarea placeholder. | ||||
| * | | | | | | | Improve new file commit placeholder. | Ciro Santilli | 2014-09-30 | 1 | -1/+2 |
| | |_|/ / / / | |/| | | | | |