summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'strict-rubocop-rules' into 'master'Dmitriy Zaporozhets2015-03-032-2/+2
|\
| * Enable ParenthesesAsGroupedExpression ruleDmitriy Zaporozhets2015-03-022-2/+2
* | Merge branch 'brakeman' into 'master'Dmitriy Zaporozhets2015-03-0310-16/+75
|\ \ | |/ |/|
| * Update ci setup documenationDmitriy Zaporozhets2015-03-021-1/+4
| * Add brakeman and jasmineDmitriy Zaporozhets2015-03-022-1/+2
| * Add brakeman rake task and improve code securityDmitriy Zaporozhets2015-03-025-15/+40
| * Add rake task for brakemanDmitriy Zaporozhets2015-03-021-0/+9
| * Add brakeman gemDmitriy Zaporozhets2015-03-022-0/+21
|/
* Merge branch 'cirosantilli-link-to-button' into 'master'Dmitriy Zaporozhets2015-03-0310-14/+15
|\
| * Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq int...Dmitriy Zaporozhets2015-03-0210-14/+15
| |\
| | * Convert Javascript links to buttons.Ciro Santilli2015-01-1710-14/+15
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-022-4/+4
|\ \ \
| * \ \ Merge pull request #8092 from cirosantilli/factor-finder-permsDmitriy Zaporozhets2015-03-021-1/+1
| |\ \ \
| | * | | Factor permission check in issuable finderCiro Santilli2015-01-011-1/+1
| * | | | Merge pull request #8349 from divineforest/cleanup-assets-compressDmitriy Zaporozhets2015-03-021-3/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove useless `assets.compress` option, Rails 4 uses only `assets.js_compres...Alexander Balashov2014-11-181-3/+3
* | | | | Merge branch 'less-sql-queries' into 'master'Dmitriy Zaporozhets2015-03-022-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reduce amount of sql queries on dashboard projects pageDmitriy Zaporozhets2015-03-022-2/+2
* | | | | Merge pull request #8812 from opichals/teamcity_branchName_not_to_be_whole_refDmitriy Zaporozhets2015-03-021-2/+2
|\ \ \ \ \
| * | | | | Fix for TeamCity buildQueue REST API build/@branchName.Standa Opichal2015-02-191-2/+2
* | | | | | Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into A...Dmitriy Zaporozhets2015-03-0211-2/+500
|\ \ \ \ \ \
| * | | | | | Add Irker serviceAorimn2015-03-0111-2/+500
* | | | | | | Merge pull request #7473 from sodabrew/patch-1Dmitriy Zaporozhets2015-03-023-18/+24
|\ \ \ \ \ \ \
| * | | | | | | Improve login screen when only OmniAuth providers are enabledAaron Stone2015-02-133-18/+24
* | | | | | | | Merge pull request #8501 from AKoetsier/slack_channel_and_usernameDmitriy Zaporozhets2015-03-024-4/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow a user to specify a channel and username for the slack-webhookAndrès Koetsier2015-02-284-4/+34
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-024-1/+28
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'project-refs-with-digit-prefix' into 'master'Dmitriy Zaporozhets2015-03-022-1/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Support names starting with a digit or _ for projects and usersNicolas Bouilleaud2015-03-022-1/+2
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'fix-protected-branches-routing' into 'master'Dmitriy Zaporozhets2015-03-022-0/+26
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Fix broken `project_url` routing when protected branches are accessed with an...Stan Hu2015-03-012-0/+26
| | |/ / / / / / /
* | | | | | | | | Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fixDmitriy Zaporozhets2015-03-021-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Removed exceeding semicolonkrolik2015-02-201-1/+1
| * | | | | | | | Fixed merge request diff page after back browser button is pressed.krolik2015-02-201-1/+1
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-0214-52/+97
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' into 'master'Robert Schilling2015-03-011-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | To close an issue you must set 'state_event' to 'close'. I cannot set 'close...Derek Campbell2015-02-201-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge pull request #8890 from sue445/feature/project_api_avatar_urlJeroen van Baarsen2015-03-017-9/+55
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Expose avatar_url in projects APIsue4452015-03-017-9/+55
| * | | | | | | | | Update Dockerfile for GitLab 7.8.1Robert Schilling2015-03-011-1/+1
| * | | | | | | | | Merge pull request #8757 from bbodenmiller/patch-1Robert Schilling2015-02-281-1/+1
| |\ \ \ \ \ \ \ \ \