8588 Commits

Include renames

Author	SHA1	Message	Date
Robert Speicher	0e5fbb29f4	Remove unused task_[un]check states from Update services ... These were left over from the old Task handling.	2015-07-08 17:56:56 -04:00
Robert Schilling	e21bd9490c	Merge branch 'patch-1' into 'master' ... Fix Transfer project input width. Hi, On the **Transfer project** box of project settings page, the **Namespace** input is wider than other inputs. This PR set the `col-sm-*` css-class of the container to the same as other inputs. ## Screenshots Before  After  See merge request !940	2015-07-08 06:53:46 +00:00
Robert Schilling	854679cb80	Merge branch 'fix-irker-capitalization' into 'master' ... Change "Irc Uri" -> "IRC URI" See merge request !937	2015-07-08 06:52:28 +00:00
Metalaka	ecf26b8947	Fix Transfer project input width.	2015-07-07 22:14:49 +02:00
Stan Hu	954eedf368	Change "Irc Uri" -> "IRC URI"	2015-07-07 05:48:32 -07:00
Dmitriy Zaporozhets	62c8bc22cc	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-07-07 12:59:45 +02:00
Sytse Sijbrandij	5ee8ae4894	Detail too many warning to explain that merge will still work.	2015-07-06 22:03:36 +02:00
Stan Hu	4254f09eaa	Return 40x error codes if branch could not be deleted in UI	2015-07-06 09:47:22 -07:00
Stan Hu	e2190115e8	Merge branch 'graphs-branch-switching' into 'master' ... 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	2015-07-06 15:12:24 +00:00
Daniel Gerhardt	2963e7fd1c	Add ref switching support for graphs ... 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.	2015-07-06 16:44:30 +02:00
Dmitriy Zaporozhets	99c3b112fa	Merge branch 'disable-sticky-diffs' into 'master' ... Disable sticky diffs Revert feature introduced in https://github.com/gitlabhq/gitlabhq/pull/8760 Why? * It has unfixed bug for long time which is really annoying - https://github.com/gitlabhq/gitlabhq/pull/8760 * I was not able to properly fix it * It affected performance in bad way See merge request !935	2015-07-06 13:23:32 +00:00
Dmitriy Zaporozhets	f3590c83ea	Merge branch 'audit_log' into 'master' ... Audit log for user authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931	2015-07-06 10:09:53 +00:00
Valery Sizov	411829fdb5	Audit log for user authentication	2015-07-06 12:36:08 +03:00
Dmitriy Zaporozhets	9860ab0f22	Remove sticky-diff functionality ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-06 11:34:37 +02:00
Dmitriy Zaporozhets	919e702c86	Revert "Diff headers made sticky" ... This reverts commit af44c65030.	2015-07-06 11:30:30 +02:00
Dmitriy Zaporozhets	5f52d6a038	Merge branch 'add-irker-options' into 'master' ... 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  ### After  See merge request !930	2015-07-06 08:57:16 +00:00
Stan Hu	d4be82d1c9	Add Irker service configuration options ... Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139	2015-07-05 06:40:56 -07:00
Daniel Gerhardt	bee3979a4a	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.	2015-07-03 00:22:20 +02:00
Dmitriy Zaporozhets	7081ab1e9e	Merge branch 'add-unlock-access' into 'master' ... 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  #### Admin edit user page  ### What are the relevant issue numbers? This replaces !288. Closes https://github.com/gitlabhq/gitlabhq/issues/9381 See merge request !922	2015-07-02 13:39:35 +00:00
catatsuy	87ac590078	'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.	2015-07-02 21:28:31 +09:00
Stan Hu	3e738e3b9a	Add support for unlocking users in admin settings ... Closes https://github.com/gitlabhq/gitlabhq/issues/9381	2015-07-02 04:22:51 -07:00
Dmitriy Zaporozhets	7c42aaa576	Merge branch 'anonymous-applications' into 'master' ... 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.  See merge request !924	2015-07-02 10:55:29 +00:00
Douwe Maan	cd5e79e98b	Correctly show anonymous authorized applications under Profile > Applications.	2015-07-02 11:53:31 +02:00
Stan Hu	b643fa1603	Remove link leading to a 404 error in Deploy Keys page ... Closes #1866	2015-07-01 22:53:52 -07:00
Robert Speicher	2ca7ffd094	Merge branch 'gfm-commit' into 'master' ... commit hashes are monospaced Use a monospaced font for GFM commit and commit range references See merge request !914	2015-07-01 19:25:19 +00:00
Nicolás Reynolds	2662c7932a	commit hashes are monospaced	2015-07-01 13:33:29 -03:00
Dmitriy Zaporozhets	2e6bbb12f8	Refactor can_be_merged logic for merge request ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-01 17:24:03 +02:00
Dmitriy Zaporozhets	804168e1de	Merge branch 'use-rugged-for-merge' into 'master' ... Merge branches inside one repository using rugged instead of satellites Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @rspeicher @DouweM See merge request !918	2015-07-01 15:08:41 +00:00
Dmitriy Zaporozhets	d24c40ec21	Merge branches inside one repository using rugged instead of satellites ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-01 16:23:58 +02:00
Valery Sizov	6ede2db328	fix of GitLab CI forking	2015-07-01 13:26:45 +03:00
Dmitriy Zaporozhets	f31d2aa44d	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-07-01 11:41:26 +02:00
Dmitriy Zaporozhets	98049a3e0c	Merge branch 'ui-improvements' into 'master' ... UX improvements * make atom feed on commits page smaller so it capture less attention * open big image 400px instead of default 40px when click on user avatar See merge request !910	2015-07-01 09:40:44 +00:00
Dmitriy Zaporozhets	16b8a1ef04	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-07-01 11:37:22 +02:00
Douwe Maan	690aafebdb	Merge branch 'group_settings_nav' into 'master' ... Fix consistency issue in sidebars of Project and Group Settings. Fixes #2277  See merge request !1871	2015-07-01 09:32:41 +00:00
Dmitriy Zaporozhets	2d85458ac7	Merge branch 'fix-zero-sha-lookup' into 'master' ... Repository#blob_at should return nil for 00000000... sha Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !916	2015-07-01 09:30:43 +00:00
Dmitriy Zaporozhets	87df927f20	Merge branch 'reporter-manage-issues' into 'master' ... Reporter role can manage issue tracker now Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !908	2015-07-01 09:19:56 +00:00
Dmitriy Zaporozhets	d75f16c2ec	Fix commits feed button ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-01 11:19:07 +02:00
Dmitriy Zaporozhets	baf12f45d8	Repository#blob_at should return nil for 00000000... sha ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-01 11:02:37 +02:00
Dmitriy Zaporozhets	70666a52b4	Use to_reference menthod when render issue id in list ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-07-01 09:46:37 +02:00
Dmitriy Zaporozhets	4d80360bed	Cache markdown of comments ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-30 15:54:20 +02:00
Dmitriy Zaporozhets	40e31e1db3	Cache issue in the list ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-30 15:48:19 +02:00
Dmitriy Zaporozhets	496f94de4a	Cache commits list ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-30 15:41:25 +02:00
Dmitriy Zaporozhets	b76659c537	Re-use event cache with other users unless its personal ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-30 15:34:16 +02:00
Dmitriy Zaporozhets	f9261e6596	Open big avatar when click on user image ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-30 15:23:32 +02:00
Dmitriy Zaporozhets	b42c40bff3	Make commits atom feed button smaller ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-30 15:13:18 +02:00
Dmitriy Zaporozhets	a5b54f919a	Reporter role can manage issue tracker now ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-30 13:33:02 +02:00
Dmitriy Zaporozhets	88162f6970	Merge branch 'fix-relative-submodule-namespace-path' into 'master' ... 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	2015-06-29 14:04:04 +00:00
Robert Speicher	ae75b2ee40	Remove requires-input from the Network Graph form ... The "Begin with the selected commit" checkbox requires the submit button to be enabled, even if the extended SHA1 input field is blank.	2015-06-26 22:49:32 -04:00
Robert Speicher	8384b577ef	Remove duplicate 'required: true' attribute	2015-06-26 22:08:34 -04:00
Robert Speicher	f6503f71f9	Remove disableButtonIf[Any]EmptyField calls from forms ... These have been replaced by the "requiresInput" behavior.	2015-06-26 22:07:59 -04:00