summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'import-gh-pull-requests' into 'master' Douwe Maan2016-01-061-0/+1
|\ | | | | | | | | | | | | Import GitHub Pull Requests into GitLab Fixes #2833 See merge request !2168
| * Update CHANGELOGDouglas Barbosa Alexandre2016-01-051-0/+1
| |
* | Merge branch 'feature/detailed-user-endpoint' of ↵Dmitriy Zaporozhets2016-01-061-0/+3
|\ \ | | | | | | | | | https://gitlab.com/Michi302/gitlab-ce
| * | Add missing changelog entryMichi302/gitlab-ce-feature/detailed-user-endpointMichi3022016-01-051-0/+1
| | |
* | | Merge branch 'validate-readme-format' into 'master'Robert Speicher2016-01-051-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate README format Take the first previewable README file as project's README, otherwise if none file is available, or we can't preview any of them, we assume that project doesn't have a README file. Fixes #3978
| * | | [ci skip] Update CHANGELOGvalidate-readme-formatDouglas Barbosa Alexandre2016-01-051-0/+1
| | | |
* | | | Update version check images to use SVGRobert Speicher2016-01-051-0/+1
| |_|/ |/| |
* | | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
| * \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-031-3/+47
| |\ \ \
| * \ \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-121-4/+36
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-021-0/+1
| |\ \ \ \ \
| * | | | | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+1
| | | | | | |
* | | | | | | Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' Douwe Maan2016-01-051-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'New Merge Request' buttons on canonical repo. (by @joshfng) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners. See merge request !2300
| * | | | | | Show 'New Merge Request' buttons on canonical repo.Josh Frye2016-01-031-0/+2
| | | | | | |
* | | | | | | Merge branch 'fix-api-lookup-with-usernames-with-dots' of ↵Dmitriy Zaporozhets2016-01-051-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce
| * | | | | | | Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-031-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use the /projects/:id API by specifying :id in "namespace/project" format would always result in a 404 if the namespace contained a dot. The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints: "By default the :id parameter doesn't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within an :id add a constraint which overrides this - for example id: /[^\/]+/ allows anything except a slash." Closes https://github.com/gitlabhq/gitlabhq/issues/9573
* | | | | | | Don't notify users twice if they are both project watchers and subscribersStan Hu2016-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4708
* | | | | | | Merge branch 'show-all-builds-by-default' into 'master' Robert Speicher2016-01-041-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show all builds by default in the builds page Fixes #4240 See merge request !2243
| * | | | | | | Update CHANGELOGRobert Speicher2016-01-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Show 'All' tab by default in the builds pageshow-all-builds-by-defaultDouglas Barbosa Alexandre2016-01-041-0/+2
| | | | | | | |
* | | | | | | | Added system hooks messages for renaming and transferring a projectSteve Norman2016-01-041-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'expire-cache-on-app-settings-change' into 'master' Dmitriy Zaporozhets2016-01-041-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire view caches when application settings change If the admin disables Gravatar, for example, before the views would not invalidate. Now they invalidate automatically when this happens. Closes #5728 See merge request !2280
| * | | | | | Expire view caches when application settings changeStan Hu2016-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #5728
* | | | | | | Don't attempt to set Referrer policy in Safarirs-safari-version-checkRobert Speicher2015-12-311-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While Safari supports the policy, it does not (currently, as of 9.x) recognize `origin-when-cross-origin` as a valid value, so we omit the policy entirely under Safari. Closes #5609
* | | | | | Update CHANGELOGRobert Speicher2015-12-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Update CHANGELOGRobert Speicher2015-12-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Swap Author and Assignee Selectors on issuable index viewZeger-Jan van de Weg2015-12-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #4039
* | | | | | Update CHANGELOGRobert Speicher2015-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Fix project transfer e-mail sending incorrect paths in e-mail notificationStan Hu2015-12-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670
* | | | | | Update CHANGELOGRobert Speicher2015-12-291-4/+4
| |_|_|_|/ |/| | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'disable-git-follow' into 'master' Dmitriy Zaporozhets2015-12-281-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable --follow in `git log` to avoid loading duplicate commit data in infinite scroll `git` doesn't work properly when `--follow` and `--skip` are specified together. We could even be **omitting commits in the Web log** as a result. Here are the gory details. Let's say you ran: ``` git log -n=5 --skip=2 README ``` This is the working case since it omits `--follow`. This is what happens: 1. `git` starts at `HEAD` and traverses down the tree until it finds the top-most commit relevant to README. 2. Once this is found, this commit is returned via `get_revision_1()`. 3. If the `skip_count` is positive, decrement and repeat step 2. Otherwise go onto step 4. 4. `show_log()` gets called with that commit. 5. Repeat step 1 until we have all five entries. That's exactly what we want. What happens when you use `--follow`? You have to understand how step 1 is performed: * When you specify a pathspec on the command-line (e.g. README), a flag `prune` [gets set here](https://github.com/git/git/blob/master/revision.c#L2351). * If the `prune` flag is active, `get_commit_action()` determines whether the commit should be [scanned for matching paths](https://github.com/git/git/blob/master/revision.c#L2989). * In the case of `--follow`, however, `prune` is [disabled here](https://github.com/git/git/blob/master/revision.c#L2350). * As a result, a commit is never scanned for matching paths and therefore never pruned. `HEAD` will always get returned as the first commit, even if it's not relevant to the README. * Making matters worse, the `--skip` in the example above would actually skip a every other entry after `HEAD` N times. If README were changed in these skipped commits, we would actually miss information! Since git uses a matching algorithm to determine whether a file was renamed, I believe `git` needs to generate a diff of each commit to do this and traverse each commit one-by-one to do this. I think that's the rationale for disabling the `prune` functionality since you can't just do a simple string comparison. Closes #4181, #4229, #3574, #2410 See merge request !2210
| * | | | | Disable --follow in `git log` to avoid loading duplicate commit data in ↵Stan Hu2015-12-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | infinite scroll `git` doesn't work properly when `--follow` and `--skip` are specified together. We could even be **omitting commits in the Web log** as a result. Here are the gory details. Let's say you ran: ``` git log -n=5 --skip=2 README ``` This is the working case since it omits `--follow`. This is what happens: 1. `git` starts at `HEAD` and traverses down the tree until it finds the top-most commit relevant to README. 2. Once this is found, this commit is returned via `get_revision_1()`. 3. If the `skip_count` is positive, decrement and repeat step 2. Otherwise go onto step 4. 4. `show_log()` gets called with that commit. 5. Repeat step 1 until we have all five entries. That's exactly what we want. What happens when you use `--follow`? You have to understand how step 1 is performed: * When you specify a pathspec on the command-line (e.g. README), a flag `prune` [gets set here](https://github.com/git/git/blob/master/revision.c#L2351). * If the `prune` flag is active, `get_commit_action()` determines whether the commit should be [scanned for matching paths](https://github.com/git/git/blob/master/revision.c#L2989). * In the case of `--follow`, however, `prune` is [disabled here](https://github.com/git/git/blob/master/revision.c#L2350). * As a result, a commit is never scanned for matching paths and therefore never pruned. `HEAD` will always get returned as the first commit, even if it's not relevant to the README. * Making matters worse, the `--skip` in the example above would actually skip every other after `HEAD` N times. If README were changed in these skipped commits, we would actually miss information! Since git uses a matching algorithm to determine whether a file was renamed, I believe `git` needs to generate a diff of each commit to do this and traverse each commit one-by-one to do this. I think that's the rationale for disabling the `prune` functionality since you can't just do a simple string comparison. Closes #4181, #4229, #3574, #2410
* | | | | | Merge branch 'add-recaptcha-support' into 'master' Dmitriy Zaporozhets2015-12-281-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Google reCAPTCHA in user registration to prevent spammers To do: - [x] Failing reCAPTCHA test causes all the fields to be lost - ~~[ ] Improve styling of reCAPTCHA box~~ (not possible) - ~~[ ] Put settings in `application_settings` (?)~~ ![image](/uploads/d38ca89820d3c0066fb8aeb645fd77f0/image.png) ![image](/uploads/6b050749963691b023d076682abcf736/image.png) Page when you fail CAPTCHA: ![image](/uploads/bc4846f0a5144985bc41dfa75eeab4c1/image.png) See merge request !2216
| * | | | | | Add support for Google reCAPTCHA in user registration to prevent spammersStan Hu2015-12-271-0/+1
| | | | | | |
* | | | | | | Merge branch 'mention-all' into 'master' Robert Speicher2015-12-271-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow group/project members to mention `@all` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3473 See merge request !2205
| * | | | | | Merge branch 'master' into mention-allDouwe Maan2015-12-241-5/+8
| |\ \ \ \ \ \
| * | | | | | | Only allow group/project members to mention `@all`Douwe Maan2015-12-241-0/+1
| | | | | | | |
* | | | | | | | revert back vote buttons to issue and MR pagesValery Sizov2015-12-251-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'support-api-lookup-by-username' into 'master' Dmitriy Zaporozhets2015-12-251-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API support for looking up a user by username Needed to support Huboard See merge request !2089
| * | | | | | | | Add API support for looking up a user by usernameStan Hu2015-12-241-0/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Needed to support Huboard
* | | | | | | | Updated CHANGELOGGabriel Mazetto2015-12-241-0/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'fix-add-key-submit' into 'master' Douwe Maan2015-12-241-0/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable "Add key" button when user fills in a proper key Closes #4295 See merge request !2208
| * | | | | | Enable "Add key" button when user fills in a proper keyStan Hu2015-12-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4295
* | | | | | | Update CHANGELOGRobert Speicher2015-12-241-1/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix-changelog' into 'master'Robert Speicher2015-12-241-5/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move changelog items to their correct place. Fixes #4236 See merge request !2201
| * | | | | | Move changelog items to their correct place.Douwe Maan2015-12-241-3/+3
| | | | | | |
* | | | | | | Merge branch 'emoji_picker_frequently_used' into 'master' Valery Sizov2015-12-241-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji picker: add "frequently used" category depend on !2172 ![Screen_Shot_2015-12-24_at_16.39.04](/uploads/7117173c6f519282054bcb1b7ba248f4/Screen_Shot_2015-12-24_at_16.39.04.png) See merge request !2180
| * | | | | | added default for frequently used emojisValery Sizov2015-12-241-3/+2
| | | | | | |
| * | | | | | Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_usedValery Sizov2015-12-241-3/+17
| |\ \ \ \ \ \
| * | | | | | | add frequently used category to emoji pickerValery Sizov2015-12-221-0/+3
| | | | | | | |