summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Show the first tab automatically on MergeRequests#newrs-issue-2013Robert Speicher2015-07-181-3/+9
| | | | Closes #2013
* Merge pull request #9452 from YorickPeterse/masterRobert Speicher2015-07-181-5/+5
|\ | | | | Only load byebug on MRI
| * Only load byebug on MRIYorick Peterse2015-07-181-5/+5
| | | | | | | | | | This Gem relies on MRI specific debugging APIs. This at least allows installation on Rubinius/JRuby.
* | Merge branch 'fix-note-edit-upload-link' into 'master'Stan Hu2015-07-182-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file upload dialog for comment editing This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving. The following screenshot illustrates the issue: ![gitlab-dropzone-upload-dialog-bug](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a9885c8ba7c07338148ec9e605e5771/gitlab-dropzone-upload-dialog-bug.png) See merge request !956
| * | Fix file upload dialog for comment editingDaniel Gerhardt2015-07-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the file upload dialog which currently works for new comments but not for comment editing. The cause for this is a missing DOM class which causes traversal to the dropzone to fail. This is fixed by adding the expected `gfm-form` class to the edit form. It has to be added dynamically since adding it to the form template would break the form's layout and comment saving.
* | | Merge branch 'rs-issue-988-test' into 'master' Robert Speicher2015-07-182-1/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add test case for clicking line number anchor icon Follow-up to !988 See merge request !992
| * | | Add test case for clicking line number anchor iconrs-issue-988-testRobert Speicher2015-07-172-1/+11
|/ / /
* | | Merge branch 'fix-line-highlighter-link-click' into 'master'Robert Speicher2015-07-181-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Fix bug where clicking on the link icon on a file would result in "#Lundefined" in the URL Closes #2002 See merge request !988
| * | Fix bug where clicking on the link icon on a file would result in ↵Stan Hu2015-07-171-1/+1
| | | | | | | | | | | | | | | | | | "L#undefined" in the URL Closes #2002
* | | Merge branch 'add-support-remove-milestone' into 'master'Stan Hu2015-07-178-2/+55
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for destroying project milestones ### What does this MR do? This MR adds a "Remove" button to the project milestones page and the milestone page itself. ### Why was this MR needed? Because lots of people talked about needing to clean their toilets. :) ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/1504 ### Screenshots ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef8c7a3ea1db7b37cccae3869ac4de0a/image.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/33eb01c7bc30fb235de96db5efb8746d/image.png) See merge request !980
| * | | Add support for destroying project milestonesStan Hu2015-07-178-2/+57
| |/ / | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504
* | | Merge branch 'validate_token_and_url_format_for_gitlab_ci' into 'master' Dmitriy Zaporozhets2015-07-174-4/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate format of project_url and token for GitLab CI service. If `project_url` and `token` for are invalid, [service_hook creation](https://gitlab.com/gitlab-org/gitlab-ce/blob/7-13-stable/app/models/project_services/gitlab_ci_service.rb#L30-34) will silently fail due to validation of URL in `WebHook`. Given that token is a sequence of numbers and letters for GitLab CI making sure that there are no unexpected characters should be enough to prevent service_hook being nil. Fixes #1997 See merge request !987
| * | | Do not disappoint rubocop.validate_token_and_url_format_for_gitlab_ciMarin Jankovski2015-07-171-1/+1
| | | |
| * | | Add specs for gitlab ci service validity.Marin Jankovski2015-07-172-0/+39
| | | |
| * | | Fix failing specs after adding format verification for token and project url ↵Marin Jankovski2015-07-172-2/+2
| | | | | | | | | | | | | | | | in gitlab ci service.
| * | | Validate format of project_url and token for GitLab CI service.Marin Jankovski2015-07-171-2/+6
| | | |
* | | | Merge branch 'even-faster-search' into 'master' Dmitriy Zaporozhets2015-07-171-6/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid copy of strings in memory for parsing git grep result Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !967
| * | | | Avoid copy of strings in memory for parsing git grep resulteven-faster-searchDmitriy Zaporozhets2015-07-131-6/+5
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Update changelogDmitriy Zaporozhets2015-07-171-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-1713-23/+110
|\ \ \ \
| * \ \ \ Merge branch 'advanced-cache' into 'master' Dmitriy Zaporozhets2015-07-1713-23/+110
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Advanced cache Fixes #1993 * Build missing cache values in background job after each push * Store commit_count in project table. Refresh in background job * moved repository size calculation in background job ## Advantages Every time push is triggered - we build cache for project even without user visiting project page. That means first visit is as fast as others now. This is especially good for active projects where people have some requests fast because of cache and some slow - because cache was build in their request. Between cache expired and cache built we we had gap when Linux repo can give 502 error because calculation commits count takes 30 seconds or even more. Using value from database fix this problem. Before cache is updated you see old value from database. After - you see new one. Basically this merge request is super win to GitLab. We don't do some heavy operations in user request but instead in background job. ## Temporary problem After this migration all projects will have `0` commits in database. It fill be replaced with real value on next push. I did not add recalculation to migration because it will last forever on big instances. Can be fixed by adding rake task which will go in background on live instance without downtime See merge request !986
| | * | | Avoid cache building for super-weird case when repository root_ref is nilDmitriy Zaporozhets2015-07-171-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Store commit count in project tableadvanced-cacheDmitriy Zaporozhets2015-07-1711-19/+37
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Build missing cache items in background job after each pushDmitriy Zaporozhets2015-07-175-5/+38
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Add more seed projects. Control amount with SIZE env variableDmitriy Zaporozhets2015-07-171-1/+34
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'release-manager-owns-stable' into 'master' Valery Sizov2015-07-171-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The release manager owns the stable branches I think this helps the release manager because it means they don't have to worry about others pushing commits at the last minute. See merge request !1907
| * | | | The release manager owns the stable branchesJacob Vosmaer2015-07-171-0/+1
| |/ / / | | | | | | | | | | | | | | | | I think this helps the release manager because it means they don't have to worry about others pushing commits at the last minute.
* | | | Merge branch 'cache-two-weeks' into 'master' Dmitriy Zaporozhets2015-07-172-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Expire Rails cache entries after two weeks This should help prevent endless Redis growth. See merge request !1903
| * | | Expire Rails cache entries after two weeksJacob Vosmaer2015-07-152-0/+4
| | | | | | | | | | | | | | | | This should help prevent endless Redis growth.
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-172-34/+38
|\ \ \ \ | |_|_|/ |/| | |
| * | | Clean up editions paragraphSytse Sijbrandij2015-07-171-4/+5
| | | |
| * | | Update installation instructions.Sytse Sijbrandij2015-07-171-1/+3
| | | |
| * | | Improve the layout of the readme.Sytse Sijbrandij2015-07-171-18/+22
| | | |
| * | | Merge branch 'chef-docker' into 'master' Job van der Voort2015-07-161-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added note about chef Added note about chef being required to generate GitLab config. because of tweet https://twitter.com/grahamgilbert/status/621015318442459136 See merge request !982
| | * | | added additional spacechef-dockerkaren Carias2015-07-151-0/+1
| | | | |
| | * | | added note about chefkaren Carias2015-07-151-0/+1
| | | | |
| * | | | Merge branch 'improve-readme' into 'master' Sytse Sijbrandij2015-07-161-12/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document should start from h1 title. Also put badges on top for easier tracking Looks much better with new project page design. See merge request !983
| | * | | | Document should start from h1 title. Also put badges on top for easier trackingimprove-readmeDmitriy Zaporozhets2015-07-161-12/+7
| |/ / / /
* | | | | Merge branch 'create-branch' into 'master' Job van der Voort2015-07-167-66/+100
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Added new doc about creating a new branch Added new document about creating a branch and fixed bullets in all the other documents. Also fixed "git push REMOTE BRANCH". See merge request !1894
| * | | | fixed conflictkaren Carias2015-07-16107-242/+1079
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-07-162-2/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch 'merge-request-wip-information' into 'master'Stan Hu2015-07-152-2/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | api: expose work_in_progress flag See merge request !948
| | * | | | | api: expose work_in_progress flagBen Boeckel2015-07-102-2/+6
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-07-163-9/+8
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #9455 from rburchell/patch-1Stan Hu2015-07-141-8/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Remove author information from "post" in merge_requests API.
| | * | | | | | Remove author information from "post" in merge_requests API.Robin Burchell2015-07-131-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From both experimenting with the API and reading the source code, this appears to not be used at all. My guess is this was copypasta from somewhere else.
| * | | | | | | Merge branch 'docker-image' into 'master'Kamil Trzciński2015-07-142-1/+8
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docker image See merge request !979
| | * | | | | | Fix docker imagedocker-imageKamil Trzcinski2015-07-142-1/+8
| |/ / / / / /
* | | | | | | Merge branch 'time_ago_fix' into 'master' Dmitriy Zaporozhets2015-07-152-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time ago fix for branch compare page https://dev.gitlab.org/gitlab/gitlabhq/issues/2508 See merge request !1904
| * | | | | | Time ago fix for compare pageValery Sizov2015-07-152-0/+2
|/ / / / / /