Return 40x error codes if branch could not be deleted in UI
### What does this MR do?
This MR makes `BranchesController` return the proper status code in case of a failure to delete a branch.
### Why was this MR needed?
Deleting a branch would always return status 200, even if the branch could not be found or deleted for some reason. This was confusing because while trying to debug an issue with encoded slashes, it looked like the deletion was successful when it had failed.
### What are the relevant issue numbers?
This issue was uncovered in #1804
See merge request !823
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
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.
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
* Closesgitlab-com/support-forum#139
### Screenshots
### Before
### After
See merge request !930
Allow user to be blocked and activated via the API
When authenticating against LDAP if a user has been disabled in LDAP they can no longer log on to the website or commit over http(s) but will be able to commit using any ssh keys. This functionality allows us to look for users in GitLab that no longer exist in LDAP and disable then in GitLab.
Closes Feedback item: [Add administrative API call to block users](http://feedback.gitlab.com/forums/176466-general/suggestions/4098632-add-administrative-api-call-to-block-users)
See merge request !587
Changed the reference from gitlab cloud to gitlab.com because it was outdated.
This one confused me a bit because i was searching for gitlab cloud and the first thing i saw: "It's gone and now it's gitlab.com"
So to prevent anyone other than me from being a bit puzzled this little change should help
See merge request !929
Fix redirection to home page URL for unauthorized users
Redirection to the home page URL was broken by changing the target for
`root_url` from `DashboardController` to `RootController` in
94d3c1433d. This regression was introduced
in the 7.12.0 release.
Fixes#1916.
See merge request !928
Redirection to the home page URL was broken by changing the target for
`root_url` from `DashboardController` to `RootController` in
94d3c1433d. This regression was introduced
in the 7.12.0 release.
Fixes#1916.
Change RC/final package release timing
Creating the packages one day before the release feels strange, especially in a month like this (June 2015) where the release is on a Monday.
I think it is better to have one more RC.
See merge request !1873
'created_at DESC' is performed twice
If you are already sorting in descending order in the created_at, it is run twice when you run the .recent.
It has passed in the string 'created_at DESC'.
Ruby on Rails is directly given to the SQL.
It is a slow query in MySQL.
See merge request !825
If you are already sorting in descending order in the created_at,
it is run twice when you run the .recent.
It has passed in the string 'created_at DESC'.
Ruby on Rails is directly given to the SQL.
It is a slow query in MySQL.
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
### What are the relevant issue numbers?
Closes#1866
See merge request !923
Gem updates for security issues
- sprockets (rails dependency, but we need to specify a version to pull
in fixes)
- sass-rails (no security issues, but required an update to meet new
sprockets version requirement)
- rest-client (coveralls dependency)
See merge request !915
Fix changelog for !767 and !794
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.
See merge request !920
Robert Speicher
Dmitriy Zaporozhets
Stan Hu
Daniel Gerhardt
Valery Sizov
Job van der Voort
Robert Speicher
karen Carias
Raniere Silva
Jacob Vosmaer
Steve Norman
Sytse Sijbrandij
Markus Mauksch
Hannes Rosenögger
catatsuy
Douwe Maan
