summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Replace www.gitlab.com with about.gitlab.comCiro Santilli2014-10-073-4/+12
|
* Merge branch 'slack_integration' into 'master'Dmitriy Zaporozhets2014-10-062-12/+11
|\ | | | | | | | | | | Slack integration See merge request !1151
| * Add missing comma.Marin Jankovski2014-10-061-1/+1
| |
| * Accommodate new webhook url format.Marin Jankovski2014-10-061-5/+7
| |
| * Use only webhook for slack service integration.Marin Jankovski2014-10-062-10/+7
| |
* | Merge pull request #7964 from mr-vinn/task-listsMarin Jankovski2014-10-0615-7/+138
|\ \ | | | | | | Add task lists to issues and merge requests
| * | Add task lists to issues and merge requestsVinnie Okada2014-10-0515-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 exceptionDmitriy Zaporozhets2014-10-061-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve-autolink' into 'master'Dmitriy Zaporozhets2014-10-063-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | Improve autolink Fixes #1649 See merge request !1155
| * | Use only escaped auto_linkDmitriy Zaporozhets2014-10-063-2/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Prevent PG::Error exception when check commit reference on commitDmitriy Zaporozhets2014-10-061-4/+9
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #7379 from cirosantilli/remove-titleDmitriy Zaporozhets2014-10-061-2/+1
|\ \ | |/ |/| [minor-refactor] Remove unused title parameter on merge request creation helper.
| * Remove unused title parameter.Ciro Santilli2014-08-161-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-markdownMarin Jankovski2014-10-052-6/+73
|\ \ | | | | | | Implement cross-project Markdown references
| * | Make Mentionables work for cross-project refsVinnie Okada2014-10-032-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 ReferenceExtractorVinnie Okada2014-10-031-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 iconSullivan SENECHAL2014-10-045-11/+11
| | |
* | | Make nav links bold since some desktops does not render 500 properlyDmitriy Zaporozhets2014-10-031-1/+1
| | |
* | | Improve subnavigation styleDmitriy Zaporozhets2014-10-031-33/+6
|/ /
* | Add Pushover service integrationSullivan SENECHAL2014-10-034-2/+122
| | | | | | | | That introduce select field type for services options.
* | Merge branch 'cirosantilli-factor-commit-msg-textarea'Dmitriy Zaporozhets2014-10-037-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 Zaporozhets2014-10-037-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 Santilli2014-10-027-36/+25
| | | |
* | | | Merge branch 'new-milestone-link' into 'master'Dmitriy Zaporozhets2014-10-031-3/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New milestone and label links Fixes #1364 Fixes #1586 See merge request !1145
| * | | | New label linkDmitriy Zaporozhets2014-10-021-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add new milestone link. Hide empty milestone selectboxDmitriy Zaporozhets2014-10-021-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'signin_after_confirmation' into 'master'Dmitriy Zaporozhets2014-10-031-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 Jankovski2014-10-021-0/+17
| |/ / / / | | | | | | | | | | | | | | | dashboard, otherwise redirect to signin page
* | | | | Merge pull request #7934 from Soullivaneuh/font-awesomeDmitriy Zaporozhets2014-10-03135-278/+277
|\ \ \ \ \ | | | | | | | | | | | | Upgrade to Font Awesome v4.2
| * | | | | Upgrade to Font Awesome v4.2Sullivan SENECHAL2014-10-03135-278/+277
| | |/ / / | |/| | |
* | | | | Merge pull request #7779 from Bugagazavr/hook_tag_push_eventsDmitriy Zaporozhets2014-10-031-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add tag push events to project hook api
| * | | | | Add tag_push_events to project hook apiKirill Zaitsev2014-10-031-0/+1
| | | | | |
* | | | | | Merge pull request #7754 from Bugagazavr/hooksDmitriy Zaporozhets2014-10-036-11/+45
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | More information in merge request hook
| * | | | | Hook attributesKirill Zaitsev2014-10-026-11/+45
| | |_|/ / | |/| | |
* | | | | Merge pull request #7595 from bbodenmiller/patch-4Marin Jankovski2014-10-031-0/+5
|\ \ \ \ \ | | | | | | | | | | | | add sign-in count
| * | | | | add sign-in countBen Bodenmiller2014-08-241-0/+5
| | | | | | | | | | | | | | | | | | add sign-in count to admin section profile view
* | | | | | Merge pull request #7748 from yglukhov/clickable-source-repo-in-mrMarin Jankovski2014-10-031-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Source repo is now clickable.
| * | | | | | Source repo is now clickable.uran2014-09-121-1/+6
| | | | | | |
* | | | | | | Add parenthesis to function def with arguments.Ciro Santilli2014-10-0323-47/+47
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #7922 from ↵Robert Schilling2014-10-031-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cirosantilli/improve-remove-file-commit-placeholder Improve remove file oommit message textarea placeholder.
| * | | | | | Improve remove file textarea placeholder.Ciro Santilli2014-09-301-1/+2
| | | | | | |
* | | | | | | Merge branch 'show-build-coverage-in-mr' into 'master'Dmitriy Zaporozhets2014-10-024-5/+37
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show build coverage in MR ![Screenshot 2014-10-02 18.20.53](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/a8ff7b23bd/Screenshot_2014-10-02_18.20.53.png) See merge request !1148
| * | | | | | | Show test coverage results in MR if availableDmitriy Zaporozhets2014-10-024-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Fix 500 error on admin user pageDmitriy Zaporozhets2014-10-021-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'feature/zen_for_gfm' of github.com:Razer6/gitlabhq into ↵Marin Jankovski2014-10-025-13/+27
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Razer6-feature/zen_for_gfm Conflicts: CHANGELOG
| * | | | | | Apply ZEN mode to all GFM formsRobert Schilling2014-10-025-13/+27
| | | | | | |
* | | | | | | Merge branch 'factor-issue-mr-form-label' of ↵Dmitriy Zaporozhets2014-10-024-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 Santilli2014-09-224-34/+22
| | | | | | |
* | | | | | | Merge pull request #7921 from cirosantilli/improve-new-file-commit-placeholderRobert Schilling2014-10-021-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve new file commit message textarea placeholder.
| * | | | | | | Improve new file commit placeholder.Ciro Santilli2014-09-301-1/+2
| | |_|/ / / / | |/| | | | |