summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge branch 'blacklist-new' into 'master' Robert Speicher2016-01-081-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'new' as a reserved namespace name Closes #5930 See merge request !2344
| | * | | | | | | | | | | | Blacklist 'new'blacklist-newRobert Schilling2016-01-081-0/+1
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'suppress-allow-failure-builds' into 'master' Stan Hu2016-01-081-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress e-mails on failed builds if allow_failure is set Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`. @ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away. See merge request !2178
| | * | | | | | | | | | | Suppress e-mails on failed builds if allow_failure is setStan Hu2016-01-071-1/+5
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about benchmarks and other specs that have `allow_failure` set to `true`.
* | | | | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-6/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'docs_project_services' into 'master' Achilleas Pipinellis2016-01-081-6/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project services and JIRA documentation clean up Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/176 This was first aiming to fix the JIRA references to EE, but as I was going through it, I decided to revamp more. @Haydn once merged here and then Valery merges CE into EE it should be fixed in doc.gitlab.com as well. @dblessing the docs state that we support JIRA 6.x. I see that 7.x is out, should the docs be amended? Also we seem to have a place to document services (http://doc.gitlab.com/ce/project_services/project_services.html), but the JIRA doc is under integration :/ I'd like it to have it moved under `project_services/`, but I guess most customers know the current URL better. See merge request !2345
| | * | | | | | | | | | | Remove useless assignment to variableAchilleas Pipinellis2016-01-081-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove reference to EE from JIRA service modelAchilleas Pipinellis2016-01-081-5/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0874-232/+324
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master' Dmitriy Zaporozhets2016-01-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept 2xx status codes for successful Web hook triggers Closes https://github.com/gitlabhq/gitlabhq/issues/9956 See merge request !2332
| | * | | | | | | | | | | | Accept 2xx status codes for successful Web hook triggersStan Hu2016-01-071-1/+1
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9956
| * | | | | | | | | | | | Merge branch 'sorting-dropdown-order' into 'master' Dmitriy Zaporozhets2016-01-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes titles Fixes #5909 See merge request !2334
| | * | | | | | | | | | | | changes titlessorting-dropdown-orderJacob Schatz2016-01-071-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'cross-project-reference-move' into 'master' Dmitriy Zaporozhets2016-01-082-10/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds reference to the bottom of sidebar Fixes #4183 ![Screen_Shot_2016-01-07_at_3.17.32_PM](/uploads/8d71b475f1775d555cf5898921e86a1d/Screen_Shot_2016-01-07_at_3.17.32_PM.png) See merge request !2339
| | * | | | | | | | | | | | | adds 85% width for textcross-project-reference-moveJacob Schatz2016-01-071-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | adds reference to the bottom of sidebarJacob Schatz2016-01-072-10/+19
| | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'banner-out-of-place' into 'master' Dmitriy Zaporozhets2016-01-082-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | css change to height to make gray container fit Fixes #5893 ![Screen_Shot_2016-01-07_at_1.22.53_PM](/uploads/7bdd44a71d255fa1439e5b96af0bd48b/Screen_Shot_2016-01-07_at_1.22.53_PM.png) See merge request !2337
| | * | | | | | | | | | | | css change to height to make gray container fitbanner-out-of-placeJacob Schatz2016-01-072-0/+2
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Use `xmlschema` where even more appropriate!Robert Speicher2016-01-079-10/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use `to_s(:iso8601)` where appropriateRobert Speicher2016-01-0711-12/+12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add two custom Date/Time conversion formatsRobert Speicher2016-01-079-14/+14
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove stamp gemRobert Speicher2016-01-0710-15/+15
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #5908
| * | | | | | | | | | | Merge branch 'milestone-ref' into 'master' Robert Speicher2016-01-072-3/+25
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to milestone in "Milestone changed" system note Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4141 See merge request !2203
| | * | | | | | | | | | Milestone reference is a Markdown linkmilestone-refDouwe Maan2016-01-071-1/+5
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into milestone-refDouwe Maan2016-01-068-51/+162
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Remove icon from milestone reference.Douwe Maan2016-01-052-2/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into milestone-refDouwe Maan2016-01-0584-376/+645
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-258-28/+109
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-2452-343/+815
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Use `to_reference` in system notes.Douwe Maan2015-12-241-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Link to milestone in "Milestone changed" system noteDouwe Maan2015-12-242-4/+3
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Render milestone links as referencesDouwe Maan2015-12-241-0/+18
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'annotate-models-20160105' into 'master' Dmitriy Zaporozhets2016-01-0741-119/+176
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotate models Time to refresh the comments via `annotate`. See merge request !2311
| | * | | | | | | | | | | | | Annotate modelsStan Hu2016-01-0641-119/+176
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use fadeTo instead of cssajax-filter-commitsDmitriy Zaporozhets2016-01-071-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | Fix typo in js method and some repeating cssDmitriy Zaporozhets2016-01-073-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | Add support for ref and path to commits filteringDmitriy Zaporozhets2016-01-073-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | Prevent loading first 20 commits twiceDmitriy Zaporozhets2016-01-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | Add ajax filtering for commits listDmitriy Zaporozhets2016-01-072-46/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also handle commits list with Pager class to prevent code duplication Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | Add search field to commits pageDmitriy Zaporozhets2016-01-072-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | | | Filter commits by search parameterDmitriy Zaporozhets2016-01-071-2/+8
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0729-58/+296
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch 'fix-missing-day-in-network-graph' into 'master' Dmitriy Zaporozhets2016-01-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing date of month in network graph when commits span a month Closes #3635, #1383 Before: ![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png) After: ![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png) See merge request !2325
| | * | | | | | | | | | | | Fix missing date of month in network graph when commits span a monthStan Hu2016-01-061-1/+1
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3635, #1383
| * | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-0714-7/+254
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'remove-influxdb-credentials' into 'master' Yorick Peterse2016-01-072-10/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request !2319
| | * | | | | | | | | | | | Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-062-10/+0
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
| * | | | | | | | | | | | Merge branch 'more-opengraph' into 'master' Robert Speicher2016-01-066-30/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Open Graph data for group, project and commit. See merge request !2211
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into more-opengraphmore-opengraphDouwe Maan2016-01-068-51/+162
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Don't override issue page description in project layout.Douwe Maan2016-01-064-10/+7
| | | | | | | | | | | | | |