summaryrefslogtreecommitdiff
path: root/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fork_visibility_level' into 'master'Dmitriy Zaporozhets2015-07-101-0/+1
|\ | | | | | | | | | | | | | | Forks should not have more permissive visibility levels than the original https://dev.gitlab.org/gitlab/gitlabhq/issues/2286 See merge request !936
| * Fork visibility level fixfork_visibility_levelValery Sizov2015-07-061-0/+1
| |
* | Make left menu more hierarchical and less contextual by adding back item at topDmitriy Zaporozhets2015-07-101-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Mention project page redesign in CHANGELOGDmitriy Zaporozhets2015-07-091-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve-postgres-restore-cleaning' into 'master' Dmitriy Zaporozhets2015-07-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Use native Postgres database cleaning during backup restore We were using hacks to drop tables etc during a Postgres backup restore. With this change, we let pg_dump insert the DROP TABLE statements it needs at the start of the SQL dump. See merge request !1891
| * | Use native Postgres database cleaning during backup restoreJacob Vosmaer2015-07-071-0/+1
| |/ | | | | | | | | | | We were using hacks to drop tables etc during a Postgres backup restore. With this change, we let pg_dump insert the DROP TABLE statements it needs at the start of the SQL dump.
* | Merge branch 'compress-db' into 'master'Kamil Trzciński2015-07-071-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Compress database backup Restore handles both cases: uncompressed and compressed backup. As an improvement `IO.popen` can be used. /cc @jacobvosmaer See merge request !873
| * | Compress database backupKamil Trzcinski2015-07-061-0/+2
| |/
* | Return 40x error codes if branch could not be deleted in UIStan Hu2015-07-061-0/+1
| |
* | Merge branch 'graphs-branch-switching' into 'master'Stan Hu2015-07-061-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Add ref switching support for graphs It is now possible to view contributor and commit statistics for refs beyond the default branch. While the Git ref already was part of the path it has not been used before. Additionally, the code in RefsController#switch has been slighliy refactored since it would have become confusing with additional if-else branches added. See merge request !932
| * Add ref switching support for graphsDaniel Gerhardt2015-07-061-0/+1
| | | | | | | | | | | | | | | | It is now possible to view contributor and commit statistics for refs beyond the default branch. Additionally, conditions in RefsController#switch have been refactored in order that a `case` block is used now.
* | Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-061-0/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Audit log for user authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931
| * | Audit log for user authenticationValery Sizov2015-07-061-1/+2
| | |
* | | Merge branch 'add-irker-options' into 'master'Dmitriy Zaporozhets2015-07-061-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Irker service configuration options ### What does this MR do? This MR makes a number of hard-coded Irker parameters configurable in the service settings: Irker server host, port, and default IRC URI. It also removes the "max recipient" limit since the recipient list is configurable only by the project owner, and it makes no sense to update the limit when it is implied in the recipient list already. ### Why was this MR needed? The existing service assumed that gitlab.com was running an Irker daemon on `localhost` when it was not. Using Irker on gitlab.com thus did not work at all. This MR allows users to provide their own Irker daemons. ### Are there points in the code the reviewer needs to double check? My main concern is whether allowing a user to specify the server/port combination would have security implications for a host. Given that HipChat and Slack allow users to do this, I didn't think this was doing anything novel. ### What are the relevant issue numbers? * Closes #1713 * Closes #1714 * Closes gitlab-com/support-forum#139 ### Screenshots ### Before ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2eb3eb815e249e9fb669fc97ecd4f3c8/image.png) ### After ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cceaba951c05bd3df2c842cc68046b87/image.png) See merge request !930
| * | Add Irker service configuration optionsStan Hu2015-07-051-0/+1
| |/ | | | | | | | | | | Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139
* | Add 7.12.2 CHANGELOG entriesJacob Vosmaer2015-07-031-0/+3
| |
* | Allow user to be blocked and unblocked via the APISteve Norman2015-07-031-0/+1
| |
* | Fix redirection to home page URL for unauthorized usersDaniel Gerhardt2015-07-031-0/+1
| | | | | | | | | | | | | | | | | | Redirection to the home page URL was broken by changing the target for `root_url` from `DashboardController` to `RootController` in 94d3c1433df9380ca83f1f35a540074ff0690410. This regression was introduced in the 7.12.0 release. Fixes #1916.
* | Merge branch 'add-unlock-access' into 'master'Dmitriy Zaporozhets2015-07-021-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for unlocking users in admin settings ### What does this MR do? This MR gives the ability to unlock a user from the Admin panel. ### Why was this MR needed? If a user fails to login a certain number of times, Devise locks the user out for a certain amount of time (e.g. 10 minutes). There is no way for an admin to unlock a user if this happens (aside from editing the `locked_at` field entirely). ### Screenshots #### Admin index page ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14c661d1d1f026770997b19af714c514/image.png) #### Admin edit user page ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0c6f795757e5f03eeb923d818b7d6a96/image.png) ### What are the relevant issue numbers? This replaces !288. Closes https://github.com/gitlabhq/gitlabhq/issues/9381 See merge request !922
| * | Add support for unlocking users in admin settingsStan Hu2015-07-021-0/+1
| |/ | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9381
* | add CHANGELOGcatatsuy2015-07-021-0/+1
| |
* | Merge branch 'anonymous-applications' into 'master'Dmitriy Zaporozhets2015-07-021-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly show anonymous authorized applications under Profile > Applications. Fixes #1907. Access tokens that were created using the ["Resource Owner Password Credentials" flow](http://doc.gitlab.com/ce/api/oauth2.html#resource-owner-password-credentials) by the user entering their username and password don't have a connected application, so the Profile > Applications page used to crash. These tokens are now rendered as "Anonymous" and can be revoked. ![Screen_Shot_2015-07-02_at_11.53.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0fb044ce1fbf5d5e2825c3abee7763ee/Screen_Shot_2015-07-02_at_11.53.55.png) See merge request !924
| * | Correctly show anonymous authorized applications under Profile > Applications.Douwe Maan2015-07-021-0/+1
| | |
* | | Merge branch 'disable-deploy-edit-link' into 'master'Dmitriy Zaporozhets2015-07-021-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove link leading to a 404 error in Deploy Keys page ### What does this MR do? This MR removes a link that would lead an admin to believe he/she could edit a deploy key, but clicking on this link would lead to a 404. ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b36cd76287d6389a09f9e0e49c1b6751/image.png) ### What are the relevant issue numbers? Closes #1866 See merge request !923
| * | Remove link leading to a 404 error in Deploy Keys pageStan Hu2015-07-011-0/+1
| |/ | | | | | | Closes #1866
* | Fix changelog for !767 and !794Daniel Gerhardt2015-07-011-2/+1
|/ | | | | These changes did not make it into the 7.12.0 release. The entry for !794 is already correctly listed for 7.12.1 so it has been removed.
* Mention faster merge operation inside one projectDmitriy Zaporozhets2015-07-011-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Extract the longest-matching ref from a commit path when multiple matches occurStan Hu2015-07-011-0/+1
| | | | Closes #1839
* Update CHANGELOG for 7.12.1Jacob Vosmaer2015-07-011-0/+9
|
* Mention performance improvements after adding cache to some fragmentsDmitriy Zaporozhets2015-07-011-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'reporter-manage-issues' into 'master'Dmitriy Zaporozhets2015-07-011-0/+1
|\ | | | | | | | | | | | | | | Reporter role can manage issue tracker now Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !908
| * Reporter role can manage issue tracker nowreporter-manage-issuesDmitriy Zaporozhets2015-06-301-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 7.12 has been releasedJacob Vosmaer2015-06-301-1/+1
| |
* | Merge branch 'fix-c-prototype-highlighting' into 'master'Stan Hu2015-06-301-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Bump rugments to 1.0.0beta8 to fix C prototype function highlighting Closes #1890 See merge request !902
| * | Bump rugments to v1.0.0beta8 to fix C prototype function highlightingStan Hu2015-06-281-0/+1
| |/ | | | | | | Closes #1890
* | Merge branch '1791-fix-github-issue-order' into 'master'Stan Hu2015-06-291-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong order of issues when importing from github ### 1. What does this MR do? The order of issues imported from GitHub is fixed. ### 2. Are there points in the code the reviewer needs to double check? Nothing. ### 3. Why was this MR needed? The default behaviors of GitHub API at listing issues are sort: :created and direction: :desc. See GitHub API details at https://developer.github.com/v3/issues/#list-issues. ### 4. What are the relevant issue numbers / Feature requests? Fixes #1791 ### 5. Screenshots (if relevant) Nothing See merge request !898
| * | Fix wrong order of issues when importing from githubHiroyuki Sato2015-06-281-0/+1
| |/ | | | | | | | | See API details at https://developer.github.com/v3/issues/. Refs #1791
* | Merge branch 'fix-relative-submodule-namespace-path' into 'master'Dmitriy Zaporozhets2015-06-291-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path ### What does this MR do? This MR fixes a bug in resolving a namespace when the `name` differed from `path`. ### Why was this MR needed? The original code was using `name`, when the proper input to `namespace_project_path` was `path`. ### What are the relevant issue numbers? Closes #1849 See merge request !864
| * Fix Error 500 when relative submodule resolves to a namespace that has a ↵Stan Hu2015-06-231-0/+1
| | | | | | | | | | | | different name from its path Closes #1849
* | Update CHANGELOGDmitriy Zaporozhets2015-06-251-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'rs-default-admin-password' into 'master'Dmitriy Zaporozhets2015-06-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Change the default admin password Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2422 See merge request !865
| * | Add CHANGELOG entry for default password changers-default-admin-passwordRobert Speicher2015-06-241-0/+1
| | |
* | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2015-06-251-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Performance improvements * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for issue or merge_request with 10 comments/participants almost twice. See merge request !883
| * | Add CHANGELOG itemperformance-improvementsDmitriy Zaporozhets2015-06-241-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'add-2fa-status-to-admin-api' into 'master'Robert Speicher2015-06-241-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 2FA status to user admin API This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA. See merge request !881
| * | | Add 2FA status to user admin APIStan Hu2015-06-231-0/+1
| |/ / | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9391
* | | Added CHANGELOG message for fixing MR webhookAdam Meily2015-06-241-0/+1
| | |
* | | Merge branch 'explicit_error_ci' into 'master'Dmitriy Zaporozhets2015-06-241-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Explicit error when commit not found in the GitLab CI !!! SHOULD BE MERGED WITH https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/159 https://dev.gitlab.org/gitlab/gitlab-ci/issues/280 See merge request !871
| * | update changelogexplicit_error_ciValery Sizov2015-06-231-0/+1
| |/
* | Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-231-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix downloading of patches on public merge requests when user logged out ### What does this MR do? This MR makes it possible to download a diff patch on a public merge request when a user is logged out. ### Why was this MR needed? An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button: ``` NoMethodError - undefined method `id' for nil:NilClass: lib/gitlab/backend/shell_env.rb:9:in `set_env' lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite' lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite' app/models/merge_request.rb:219:in `to_diff' app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show' ``` ### What are the relevant issue numbers? * Closes #1225 * Closes #1854 (dup) * Closes #1858 (dup) See merge request !872
View Lorry Controller Status