| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ci-commit-status-skipped' into 'master' | Grzegorz Bizon | 2015-12-18 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | | | | | | | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Fixes #3827 Fixes #4157 /cc @grzesiek @dblessing See merge request !2139 | ||||
| | * | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if ↵ | Kamil Trzcinski | 2015-12-17 | 1 | -0/+1 |
| | | | | | | | | | the builds are enabled | ||||
| * | | Bump Rack Attack to v4.3.1 for security fix | Stan Hu | 2015-12-18 | 1 | -0/+1 |
| | | | | | | | | | https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1 | ||||
| * | | Remove duplicate entry in the changelog | Zeger-Jan van de Weg | 2015-12-18 | 1 | -1/+0 |
| |/ | |||||
| * | Api support for requesting starred projects for user | Zeger-Jan van de Weg | 2015-12-16 | 1 | -0/+1 |
| | | | | | Fixes #4112 | ||||
| * | Merge branch 'add-open-issues-count-to-api' of ↵ | Dmitriy Zaporozhets | 2015-12-16 | 1 | -0/+1 |
| |\ | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Add open_issues_count to project API | Stan Hu | 2015-12-11 | 1 | -0/+1 |
| | | | | | | | | | This is needed to support Huboard and a generally useful value. | ||||
| * | | Update CHANGELOG | Robert Speicher | 2015-12-15 | 1 | -2/+0 |
| | | | | | | | | | [ci skip] | ||||
| * | | Preserve trailing new lines at the end of file on the online editor | Douglas Barbosa Alexandre | 2015-12-14 | 1 | -0/+1 |
| | | | | | | | | | | | Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up. | ||||
| * | | Update CHANGELOGux/suppress-ci-yml-warning | Grzegorz Bizon | 2015-12-14 | 1 | -0/+3 |
| | | | | | | | | | [ci skip] | ||||
| * | | Merge branch 'ci-services-migrate' into 'master' | Kamil Trzciński | 2015-12-14 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Ci Services migrate See merge request !1985 | ||||
| | * | | Migrate CI::Services and CI::WebHooks to Services and WebHooks | Kamil Trzcinski | 2015-12-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'improve_emoji' | Valery Sizov | 2015-12-14 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | Add hover-state for emoji in emoji-pickerimprove_emoji | Valery Sizov | 2015-12-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Bump Redis requirement to 2.8 for Sidekiq 4 requirements | Stan Hu | 2015-12-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3649 [ci skip] | ||||
| * | | | | Update changelog | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | Update CHANGELOG | Robert Speicher | 2015-12-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-11 | 1 | -0/+1 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix delete notes on merge request diff Fixes #3971 See merge request !2061 | ||||
| | * | | | [ci skip] Update CHANGELOGfix-delete-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Update changelog | Grzegorz Bizon | 2015-12-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | emoji aliases problem | Valery Sizov | 2015-12-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence' | Douwe Maan | 2015-12-11 | 1 | -0/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | |||||
| | * | | | Target right release | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-12-10 | 1 | -5/+83 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Licence also accepted as license file | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Set changelog item to right release | Zeger-Jan van de Weg | 2015-11-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-11-11 | 1 | -2/+95 |
| | |\ \ \ | |||||
| | * | | | | Add specs on #license | Zeger-Jan van de Weg | 2015-10-15 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add changelog line to right release | Zeger-Jan van de Weg | 2015-10-14 | 1 | -2/+1 |
| | | | | | | |||||
| | * | | | | COPYING is now also accepted as licence file | Zeger-Jan van de Weg | 2015-10-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | Fixes #2526 | ||||
| * | | | | | Update CHANGELOG for 7bb8bb85 | Stan Hu | 2015-12-10 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'bump-devise-3.5.3' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+1 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump devise to 3.5.3 to fix reset token expiring after account creation Also fixes an incorrect redirect after login with relative URL root: Closes https://github.com/gitlabhq/gitlabhq/issues/8228 Closes #2750 See merge request !2056 | ||||
| | * | | | | Bump devise to 3.5.3 to fix reset token expiring after account creation | Stan Hu | 2015-12-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes an incorrect redirect after login with relative URL root: Closes https://github.com/gitlabhq/gitlabhq/issues/8228 Closes #2750 | ||||
| * | | | | | Merge branch 'feature/sidekiq-4' into 'master' | Dmitriy Zaporozhets | 2015-12-10 | 1 | -0/+1 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Sidekiq to 4.x Upgraded Sidekiq to 4.x. More details can be found here: #3065 After merging this MR, we will require Redis 2.8+. @stanhu have made a MR !1888 to reflect needed changes on our documentation. See merge request !2057 | ||||
| | * | | | | Upgraded Sidekiq to 4.xfeature/sidekiq-4 | Gabriel Mazetto | 2015-12-10 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'report-errors-on-service-creation' of ↵ | Dmitriy Zaporozhets | 2015-12-10 | 1 | -0/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce | ||||
| | * | | | | | Provide better diagnostic message upon project creation errors | Stan Hu | 2015-12-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents an Error 500 when project fails to create due to invalid parameters. See #3937 | ||||
| * | | | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix editing notes on a merge request diff Fixes #3910 See merge request !2041 | ||||
| | * | | | | | Merge branch 'master' into fix-edit-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow' | Dmitriy Zaporozhets | 2015-12-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Add missing changelog itemsadd-changelog-items | Douwe Maan | 2015-12-10 | 1 | -1/+8 |
| | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | | Merge branch 'rs-snippets-clipboard' | Douwe Maan | 2015-12-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Add copy-to-clipboard button to Snippets#showrs-snippets-clipboard | Robert Speicher | 2015-12-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3701 | ||||
| * | | | | | | | Merge branch 'devise_paranoid_mode' into 'master' | Robert Speicher | 2015-12-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Devise paranoid mode and ensure the returned message is the same every time. This will prevent user enumeration (low impact). Prior to this change a user could type an email in the password reset field and if the email didn't exist it returned an error. If the email was valid it returned a message saying the forgot password link had been emailed. After this change the user will receive a message that if the email is in our database the reset link will be emailed. I also changed the throttle mechanism so it still works the same but now returns the exact same message as above. Previously it would say 'You've already sent a request. Wait a few minutes'. This also allows user enumeration, although it requires a double-check. Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624 See merge request !2044 | ||||
| | * | | | | | | | Use devise paranoid mode and ensure the same message is returned every time | Drew Blessing | 2015-12-09 | 1 | -0/+3 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Skipped CI because it has already passed. Had to rebase due to CHANGELOG. | ||||
| * | | | | | | | Merge branch 'move-network' | Dmitriy Zaporozhets | 2015-12-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Move Network page from separate tab to sub tab of Commits | Dmitriy Zaporozhets | 2015-12-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | | Update CHANGELOG | Robert Speicher | 2015-12-09 | 1 | -5/+3 |
| | |_|/ / / / |/| | | | | | | | | | | | | | | | | | [ci skip] | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |