summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Auto annotate models on migrationannotate-modelsZeger-Jan van de Weg2016-05-061-0/+44
| | | | [ci skip]
* Annotate the modelsZeger-Jan van de Weg2016-05-0672-323/+485
|
* Merge branch 'teamcity-changelog-fix' into 'master' Yorick Peterse2016-05-051-1/+1
|\ | | | | | | | | Moved TeamCity changelog entry to 8.7.3 See merge request !4049
| * Moved TeamCity changelog entry to 8.7.3Yorick Peterse2016-05-051-1/+1
|/ | | | [ci skip]
* Merge branch 'log-impersonation-events' into 'master' Stan Hu2016-05-053-0/+5
|\ | | | | | | | | | | | | Log to application.log when an admin starts and stops impersonating a user Closes gitlab-org/gitlab-ee#536 See merge request !4028
| * Log to application.log when an admin starts and stops impersonating a userStan Hu2016-05-043-0/+5
| | | | | | | | Closes gitlab-org/gitlab-ee#536
* | Merge branch 'new-badge-url' into 'master' Rémy Coutable2016-05-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Use new build badge URLs Use new build badge URLs to follow the instruction at [the project badges](https://gitlab.com/gitlab-org/gitlab-ce/badges). See merge request !4037
| * | Use new build badge URLsTakuya Noguchi2016-05-041-1/+1
| | |
* | | Merge branch 'fix-team-build-state-in-mr-widget' into 'master' Stan Hu2016-05-043-10/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request widget displays TeamCity build state and code coverage correctly again ## What does this MR do? This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer. ## Are there points in the code the reviewer needs to double check? The changes are quite simple, so please simply double check them. ## Why was this MR needed? This MR is needed to make the TeamCity build status working again. ## What are the relevant issue numbers? #17080 See merge request !3998
| * | | Feedback from stanhuBenedikt Huss2016-05-053-14/+26
| | | |
| * | | Merge request widget displays TeamCity build state and code coverage ↵Benedikt Huss2016-05-052-6/+41
| | | | | | | | | | | | | | | | correctly again
* | | | Merge branch 'rs-repository-size-format' into 'master' Stan Hu2016-05-041-6/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `number_to_human_size` helper to show repository size This will intelligently format large repository sizes in GBs (or, shudder, TBs). Also, removes `rescue` clause from `repository_size` helper. The repository size has since become calculated (and cached) more intelligently, and this should no longer be necessary. See merge request !4047
| * | | Remove `rescue` clause from `repository_size` helperrs-repository-size-formatRobert Speicher2016-05-041-5/+0
| | | | | | | | | | | | | | | | | | | | The repository size has since become calculated (and cached) more intelligently, and this should no longer be necessary.
| * | | Use `number_to_human_size` helper to show repository sizeRobert Speicher2016-05-041-1/+2
| | | | | | | | | | | | | | | | | | | | This will intelligently format large repository sizes in GBs (or, shudder, TBs).
* | | | Merge branch 'sanitize-new-project-error-message' into 'master' Robert Speicher2016-05-044-1/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Sanitize repo paths in new project error message Closes #17243 See merge request !4029
| * | | Sanitize repo paths in new project error messageStan Hu2016-05-044-1/+17
| | | | | | | | | | | | | | | | Closes #17243
* | | | Merge branch '17000-comment-links' into 'master' Jacob Schatz2016-05-041-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove break-all from links Closes #17000 See merge request !4042
| * | | | Remove break-all from links17000-comment-linksAnnabel Dunstone2016-05-041-4/+0
| |/ / /
* | | | Merge branch 'fix-files-page-colors' into 'master' Jacob Schatz2016-05-042-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix file list page border colors See merge request !4008
| * | | | Fix table bordersfix-files-page-colorsDmitriy Zaporozhets2016-05-021-3/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Use correct border color between table rowsDmitriy Zaporozhets2016-05-022-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'improve-milestone-ui' into 'master' Jacob Schatz2016-05-043-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve milestone page UI * remove button after edit button * use hex value for text color * re-use existing text color variables Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !4014
| * | | | | Improve milestone page UIimprove-milestone-uiDmitriy Zaporozhets2016-05-033-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'invalid-exists-on-new-push' into 'master' Yorick Peterse2016-05-043-0/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Expire repository exists? and has_visible_content? caches after a push if necessary See merge request !3975
| * | | | | Expire repository exists? and has_visible_content? caches after a push if ↵Stan Hu2016-05-043-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary Closes #17012
* | | | | | Merge branch 'clean-user-profile-classes' into 'master' Jacob Schatz2016-05-042-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
| * | | | | | Remove unused .contributed-projects classKarlo Soriano2016-04-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector.
* | | | | | | Merge branch 'limit-mr-seedfu' into 'master' Robert Speicher2016-05-041-1/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the number of merge requests per project to avoid long seeds in development environment This step was taking a long time because seed_fu creates N / 2 merge requests for each repo, where N is the number of branches for that repo. At the time of this writing, there are 234 branches on the gitlab-ce repo, leading to 117 merge requests. See merge request !4032
| * | | | | | Limit the number of merge requests per project to avoid long seedsStan Hu2016-05-041-1/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This step was taking a long time because seed_fu creates N / 2 merge requests for each repo, where N is the number of branches for that repo. At the time of this writing, there are 234 branches on the gitlab-ce repo, leading to 117 merge requests.
* | | | | | Merge branch 'gravatar-fix' into 'master' Rémy Coutable2016-05-043-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the new admin settings for gravatar Fixes gitlab-org/gitlab-ce#14826 See merge request !3988
| * | | | | | Use the new admin settings for gravatarArtem Sidorenko2016-05-043-3/+3
| | | | | | |
* | | | | | | Merge branch 'compact-files-list' into 'master' Jacob Schatz2016-05-041-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make files list more compact by reducing row height from 47px to 44px Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !4007
| * | | | | | Make files list more compact by reducing row height from 47px to 44pxcompact-files-listDmitriy Zaporozhets2016-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'gitlab-ci-ssh-keys-doc-fix' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation fix in CI SSH keys setup In recent versions of Docker, the `/.dockerinit` file doesn't exist any more when running inside a container. That file is used in the example here to detect whether the runner is running inside Docker or not. Change it to check for the existence of `/.dockerenv`, which does exist in all current versions of Docker. See merge request !3938
| * | | | | | | fix: in recent versions of Docker, the /.dockerinit file doesn't exist; use ↵Jason Roehm2016-04-261-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /.dockerenv instead [ci skip] Signed-off-by: Jason Roehm <jasonr@3db-labs.com>
* | | | | | | Merge branch 'exec-in-launch-wrappers' into 'master' Douwe Maan2016-05-042-3/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'exec' in Unicorn and Sidekiq launch scripts When running Unicorn or Sidekiq in the foreground this change removes an intermediate /bin/sh process. This makes process supervision in the GitLab Development Kit more reliable. This change does not affect Omnibus-GitLab (because there we do not use these launch scripts). Installations from source do use the launch scripts but for the standard GitLab init script this change will not make a difference. Custom installations using Upstart or Systemd may be affected however, because under certain configurations these systems count exactly how many forks happen during process startup, and we are reducing that number by one here. Closes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/116 See merge request !3964
| * | | | | | Use 'exec' in Unicorn and Sidekiq launch scriptsJacob Vosmaer2016-04-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running Unicorn or Sidekiq in the foreground this change removes an intermediate /bin/sh process. This makes process supervision in the GitLab Development Kit more reliable. This change does not affect Omnibus-GitLab (because there we do not use these launch scripts). Installations from source do use the launch scripts but for the standard GitLab init script this change will not make a difference. Custom installations using Upstart or Systemd may be affected however, because under certain configurations these systems count exactly how many forks happen during process startup, and we are reducing that number by one here.
* | | | | | | Merge branch 'use-rugged-to-create-tag' into 'master' Rémy Coutable2016-05-049-67/+105
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
| * | | | | | | Use a similar approach to branch creation for tag creationuse-rugged-to-create-tagRémy Coutable2016-05-045-53/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Use Rugged's TagCollection#create instead of gitlab-shell's ↵Rémy Coutable2016-05-047-49/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'fix-typo-in-user-steps' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in user steps feature file Just came across a typo in the user steps file. See merge request !3943
| * | | | | | | | Fix typo in user steps featureKarlo Soriano2016-04-271-1/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'doc-fix-db-gem-install-instructions' into 'master' Rémy Coutable2016-05-041-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update patch_versions.md with explicit --with statement for db gem group ## What does this MR do? Updates `patch_versions.md`'s instructions on installing gems to explicitly install either the postgres or mysql groups. ## Are there points in the code the reviewer needs to double check? No, but thank you for your time. ## Why was this MR needed? I performed the steps listed in `patch_versions.md` and ran the command for updating postgres gems. Bundler told me at the end that it had not installed the postgres gem group, which caused the next step, migrating the DB, to fail for obvious reasons. Changing the command to `--with postgres` made it install the postgres gem group, and db:migrate then passed. ## What are the relevant issue numbers? None ## Screenshots (if relevant) N/A See merge request !3955
| * | | | | | | Add explicit --with statement for postgres and mysql gem groups as ↵mike2016-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | necessary. When I followed these instructions, the first command did not install the postgres group and it had to be made explicit.
* | | | | | | | Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'Douwe Maan2016-05-0411-9/+71
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile.lock
| * | | | | | | API support for the 'since' and 'until' operators on commit requestsPaco Guzman2016-04-2911-9/+71
| |/ / / / / / | | | | | | | | | | | | | | - Parameter validation as ISO8601 format
* | | | | | | Merge branch 'feature-proposal-contribution-guidelines' into 'master' Douwe Maan2016-05-041-0/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature proposal issue template in contributing guide This adds a feature proposal template to the contribution guidelines for internal and external use. Fixes #15448 cc @markpundsack @stanhu @dzaporozhets See merge request !3967
| * | | | | | | feature proposal issue template in contributing guidefeature-proposal-contribution-guidelinesJob van der Voort2016-04-281-0/+10
| | | | | | | |
* | | | | | | | Merge branch 'lstrip-cop' into 'master' Rémy Coutable2016-05-041-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable LstripRstrip cop This requires no code changes since it doesn't actually change anything in the codebase, just preventative. See merge request !3959
| * | | | | | | | Enable LstripRstrip copConnor Shea2016-04-271-2/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires no code changes since it doesn't actually change anything in the codebase, just preventative.