summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Fix checkbox alignment in application settingsVinnie Okada2015-03-022-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the form-control CSS class to the feature checkboxes on the application settings page to fix the vertical alignment with their labels. Also add aria-describedby attributes to form controls that have a help text block.
* | | | | | | | | | | | | | Merge pull request #8918 from rumpelsepp/update-rugmentsRobert Schilling2015-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | Update rugments, fixes #8900
| * | | | | | | | | | | | | Update rugments, fixes #8900Stefan Tatschner2015-03-051-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'collapsed-projects-list' into 'master'Dmitriy Zaporozhets2015-03-0510-80/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve projects list * Add search filtering for group projects * Show all user projects on dashboard * Refactor projects list into one view * Hide big list of projects with 'Show all' button For #2069 See merge request !1636
| * | | | | | | | | | | | | Fix project create link on group pageDmitriy Zaporozhets2015-03-041-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Improve projects listDmitriy Zaporozhets2015-03-0410-80/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add search filtering for group projects * Show all user projects on dashboard * Refactor projects list into one view * Hide big list of projects with 'Show all' button
* | | | | | | | | | | | | | Merge branch 'timeout' into 'master'Dmitriy Zaporozhets2015-03-057-16/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase timeout for Git-over-HTTP requests. Fixes #2081 and https://gitlab.com/gitlab-org/gitlab-ce/issues/232. Normal web requests are bound by the `Rack::Timeout` timeout of 60 seconds, while Grack Git-over-HTTP requests are only bound by Unicorn's timeout which is now set to 1 hour, which should be plenty. The omnibus package should be updated to no longer use `unicorn['worker_timeout']` for the Unicorn timeout, but to set the `Slowpoke.timeout`. See merge request !1619
| * | | | | | | | | | | | | Increase timeout for Git-over-HTTP requests.Douwe Maan2015-03-047-16/+50
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'update-spring' into 'master'Dmitriy Zaporozhets2015-03-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update spring to 1.3.3 See merge request !1635
| * | | | | | | | | | | | | | Update spring to 1.3.3Dmitriy Zaporozhets2015-03-042-3/+3
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'annotate-models' into 'master'Dmitriy Zaporozhets2015-03-0439-414/+462
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-annotate models See merge request !1634
| * | | | | | | | | | | | | Re-annotate modelsDmitriy Zaporozhets2015-03-0439-414/+462
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'add-more-slack-notifications' into 'master'Dmitriy Zaporozhets2015-03-0450-244/+873
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more Slack notifications for issue and merge request events From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 by Stan Hu. See merge request !1556
| * | | | | | | | | | | | | Fix specs.Douwe Maan2015-03-031-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix changelog.Douwe Maan2015-03-031-3/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Set correct object_kind on tag push data.Douwe Maan2015-03-032-3/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Set supported events per project service.Douwe Maan2015-03-0319-57/+156
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Execute GitlabCiService for both push and tag_push events.Douwe Maan2015-03-031-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Execute tag_push services and hooks when tag is created through web UI.Douwe Maan2015-03-031-5/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't execute GitlabCiService twice for pushed tags.Douwe Maan2015-03-031-4/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Only execute GitlabCiService for push events.Douwe Maan2015-03-031-2/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix specs.Douwe Maan2015-03-038-14/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Execute services for tag push.Douwe Maan2015-03-031-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Code style, directory structure.Douwe Maan2015-03-0313-57/+59
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Issue #595: Support Slack notifications upon issue and merge request eventsStan Hu2015-03-0347-195/+722
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Adds a DB migration for all services to toggle on push, issue, and merge events. 2) Upon an issue or merge request event, fire service hooks. 3) Slack service supports custom messages for each of these events. Other services not supported at the moment. 4) Label merge request hooks with their corresponding actions.
* | | | | | | | | | | | | Move items to the correct version in the changelog.Marin Jankovski2015-03-041-4/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Update changelog.Marin Jankovski2015-03-041-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Update the Changelog.Marin Jankovski2015-03-041-0/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'web_hook_extend' into 'master'Dmitriy Zaporozhets2015-03-043-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web Hook sends email of pusher See merge request !1630
| * | | | | | | | | | | | | Web Hook sends email of pusherValery Sizov2015-03-043-0/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'changelog-fix' into 'master'Marin Jankovski2015-03-041-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Service Templates to CHANGELOG See merge request !1633
| * | | | | | | | | | | | | | Added Service Templates to CHANGELOG and fixed typo.Patricio Cano2015-03-041-1/+2
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'triage-link' into 'master'Dmitriy Zaporozhets2015-03-041-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Advise on how to help others. See merge request !1632
| * | | | | | | | | | | | | | Advise on how to help others.Sytse Sijbrandij2015-03-041-0/+7
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'bump_gitlab_git' into 'master'Dmitriy Zaporozhets2015-03-042-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab_git to rc15 For #2033 See merge request !1631
| * | | | | | | | | | | | | Bump gitlab_git to rc15Dmitriy Zaporozhets2015-03-042-3/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'dashboard-milestones' into 'master'Dmitriy Zaporozhets2015-03-0413-9/+209
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dashboard milestones. Closes #1422. ![Screen_Shot_2015-03-03_at_16.20.36](https://dev.gitlab.org/gitlab/gitlabhq/uploads/795b480a2552e1d26436c3db2158cb81/Screen_Shot_2015-03-03_at_16.20.36.png) See merge request !1621
| * | | | | | | | | | | | | Add changelog entry.Douwe Maan2015-03-041-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add dashboard milestones.Douwe Maan2015-03-0312-9/+208
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-041-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | / / / / / / / / | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'connect_gitlab_buttons_doc' into 'master'Robert Schilling2015-03-041-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connect GitLab buttons doc The "GitLab buttons in Gmail" documentation was not linked from anywhere else. Instead of assuming that these docs are not current, or should not be accessible, I've linked to them from doc/integrations/README.md. If linking is the less desirable approach, please advise. See merge request !339
| | * | | | | | | | | | Merge branch 'connect_gitlab_buttons_doc' of gitlab.com:perforce/gitlab-ce ↵Ewan Edwards2015-03-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into connect_gitlab_buttons_doc
| | | * | | | | | | | | | Moved the Gmail integration line into the list of available integrations.Ewan Edwards2015-03-031-2/+1
| | | | | | | | | | | | |
| | | * | | | | | | | | | The "GitLab buttons in Gmail" document was not linked from anywhereEwan Edwards2015-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | else. It is now linked.
| | * | | | | | | | | | | Moved the Gmail integration line into the list of available integrations.Ewan Edwards2015-03-041-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | The "GitLab buttons in Gmail" document was not linked from anywhereEwan Edwards2015-03-041-0/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | else. It is now linked.
* | | | | | | | | | | | Merge branch 'autosave-new-issuables' into 'master'Marin Jankovski2015-03-042-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autosave title and description of new issues/MRs. Closes #2048. See merge request !1595
| * | | | | | | | | | | Autosave title and description of new issues/MRs.Douwe Maan2015-02-252-0/+32
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'commits_statistic' into 'master'test-fixMarin Jankovski2015-03-042-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits statistic grammar Fixes #2089 Changed spelling from Commits statistic to Commit statistics See merge request !1625
| * | | | | | | | | | | Spelling change Commit StatisticsSabba Petri2015-03-032-2/+2
| | | | | | | | | | | |