delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bump sidekiq to 3.4.2rs-bump-sidekiq	Robert Speicher	2015-08-14	2	-11/+11
\| \| \| \| \| \|	- https://github.com/mperham/sidekiq/pull/2309 - https://github.com/mperham/sidekiq/issues/2330 - https://github.com/mperham/sidekiq/pull/2422
*	Merge branch 'fix/redirect_after_sign_in' into 'master'	Stan Hu	2015-08-14	2	-18/+22
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix redirection after sign in when using auto_sign_in_with_provider Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control. See merge request !1146
\| *	Fix redirection after sign in when using auto_sign_in_with_provider	Alex Lossent	2015-08-12	2	-18/+22
\| \| \| \| \| \| \| \|	Logic for redirect path moved to a filter.
* \|	Merge branch 'mysql_insecure_password_warnings' into 'master'	Stan Hu	2015-08-14	1	-2/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Workaround the insecure password warnings emitted by MySQL 5.6 When using MySQL 5.6, the following output is emitted every time a backup is created, even with CRON=1. ``` Warning: Using a password on the command line interface can be insecure. ``` This fix works around that by sending the password via the [`MYSQL_PWD`](http://dev.mysql.com/doc/refman/5.6/en/environment-variables.html) environment variable. See merge request !1139
\| * \|	Workaround the warnings emitted by MySQL 5.6 regarding password on the	Ted Strzalkowski	2015-08-12	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|	command line.
* \| \|	Merge pull request #9528 from revaret/Fixed_alignment_issue	Stan Hu	2015-08-14	1	-1/+12
\|\ \ \ \| \| \| \| \| \| \| \|	Fix for #9527
\| * \| \|	Fixed #9527	ranjith	2015-08-13	1	-1/+12
\| \| \| \|
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Stan Hu	2015-08-14	3	-1/+39
\|\ \ \ \
\| * \ \ \	Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'	Dmitriy Zaporozhets	2015-08-14	3	-1/+39
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable internal issue tracker if external tracker in use ### What does this MR do? This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes. ### Why was this MR needed? Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them. ### What are the relevant issue numbers? Closes #2006 See merge request !993
\| \| * \| \| \|	Disable internal issue tracker if external tracker in use	Stan Hu	2015-07-17	3	-1/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2006
* \| \| \| \| \|	Merge pull request #9562 from bladealslayer/fix/flowdock-gem-update	Stan Hu	2015-08-14	5	-9/+18
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Update Flowdock integration to support new Flowdock API
\| * \| \| \| \|	Update Flowdock integration to support new Flowdock API	Boyan Tabakov	2015-08-14	5	-9/+18
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
* \| \| \| \|	Merge branch 'improve-readability' into 'master'	Dmitriy Zaporozhets	2015-08-14	4	-0/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set max-width for README, issue and merge request description It allows easier text reading on big screens ### Problem Text is hard to read on wide screens: ![Screenshot_2015-08-14_11.33.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bdb092c09495c7aa94b0589df4b7e65/Screenshot_2015-08-14_11.33.39.png) ### Solution Set max-width to content. Screenshots: ![Screenshot_2015-08-14_11.31.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/00cd7a77b81b30458a1675ec562d7463/Screenshot_2015-08-14_11.31.54.png) ![Screenshot_2015-08-14_10.53.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4756f87a3bbb7179e55b1c8f8ee40459/Screenshot_2015-08-14_10.53.16.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1161
\| * \| \| \| \|	Add CHANGELOG item	Dmitriy Zaporozhets	2015-08-14	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Set max-width for README, issue and merge request description	Dmitriy Zaporozhets	2015-08-14	3	-0/+10
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It allows easier text reading on big screens Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-14	2	-0/+2
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'respect_filters' into 'master'	Dmitriy Zaporozhets	2015-08-14	2	-0/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix: User search feature in admin area does not respect filters https://dev.gitlab.org/gitlab/gitlabhq/issues/2482 See merge request !1155
\| \| * \| \| \| \|	Fix: User search feature in admin area does not respect filtersrespect_filters	Valery Sizov	2015-08-13	2	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-08-14	17	-32/+110
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Stan Hu	2015-08-13	2	-2/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #9556 from pupaxxo/patch-3	Stan Hu	2015-08-13	1	-1/+0
\| \| \|\ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|	Fix changelog
\| \| \| * \| \| \|	Fix changelog	Andrea Ruggiero	2015-08-13	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #9557 from pupaxxo/patch-4	Robert Schilling	2015-08-13	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|	Time for 7.14.0.pre
\| \| \| * \| \| \|	Time for 7.14.0.pre	Andrea Ruggiero	2015-08-13	1	-1/+1
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'improve-hipchat-service-test' into 'master'	Dmitriy Zaporozhets	2015-08-13	7	-3/+76
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide more feedback what went wrong if HipChat service failed test This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks. Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/10f82eb02db138f9680e69cdb3d3ed82/image.png) Issue gitlab-com/support-forum#213 See merge request !1144
\| \| * \| \| \| \|	Provide more feedback what went wrong if HipChat service failed test	Stan Hu	2015-08-12	7	-3/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue gitlab-com/support-forum#213
\| * \| \| \| \| \|	Merge branch 'bring-clonebar-back' into 'master'	Dmitriy Zaporozhets	2015-08-13	2	-10/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bring clone bar back Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/5198a110c1f1bfd5b6b050b648e8ad45/image.png) See discussion in !1080 See merge request !1147
\| \| * \| \| \| \| \|	Bring clone bar back	Stan Hu	2015-08-12	2	-10/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See discussion in !1080
\| * \| \| \| \| \| \|	Merge branch 'update_changelog' into 'master'	Valery Sizov	2015-08-13	1	-0/+6
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update changelog See merge request !1153
\| \| * \| \| \| \| \|	update chnagelog	Valery Sizov	2015-08-13	1	-0/+6
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'note-query-information' into 'master'	Stan Hu	2015-08-12	3	-2/+15
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note query information See merge request !1149
\| \| * \| \| \| \| \|	api: add 'system', 'upvote', and 'downvote' fields to note queries	Ben Boeckel	2015-08-12	3	-2/+15
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9.
\| * \| \| \| \| \|	Merge branch 'more-markdown-extensions' into 'master'	Stan Hu	2015-08-12	3	-2/+3
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	markup_helper: detect .mkd and .mkdn as markdown See merge request !1148
\| \| * \| \| \| \|	markup_helper: detect .mkd and .mkdn as markdown	Ben Boeckel	2015-08-12	3	-2/+3
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'mr-merge-manually-2' into 'master'	Dmitriy Zaporozhets	2015-08-12	3	-13/+9
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move merge manually text below merge widget Replace !1121 Screenshot: #### Before ![Screenshot_2015-08-10_18.25.22](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ac7df8dd03104b3b44c61b3bff709653/Screenshot_2015-08-10_18.25.22.png) #### After ![Screenshot_2015-08-10_18.28.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c92b8eaeadb842705577dba1f52b67e5/Screenshot_2015-08-10_18.28.30.png) See merge request !1141
\| \| * \| \| \|	Fix changelogmr-merge-manually-2	Dmitriy Zaporozhets	2015-08-11	1	-3/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Move merge manually text below merge widget	Dmitriy Zaporozhets	2015-08-11	2	-10/+9
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'add-image' into 'master'	Job van der Voort	2015-08-13	2	-0/+64
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New doc about how to add an image in GitLab Basics See merge request !1918
\| * \| \| \|	fixed text	karen Carias	2015-08-11	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	fixed text	karen Carias	2015-08-11	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	fixed text	karen Carias	2015-08-10	1	-2/+1
\| \| \| \| \|
\| * \| \| \|	fixed one line	karen Carias	2015-08-06	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	fixed terminology	karen Carias	2015-08-03	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	typo	karen Carias	2015-08-02	1	-9/+9
\| \| \| \| \|
\| * \| \| \|	New doc about how to add an image in GitLab Basics	karen Carias	2015-08-02	2	-0/+64
\| \| \| \| \|
* \| \| \| \|	Merge pull request #9545 from Baldinof/add_merged_label	Dmitriy Zaporozhets	2015-08-12	4	-0/+37
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Add merged label on branches page
\| * \| \| \|	Add merged label on branches page	Florent (HP)	2015-08-11	4	-0/+37
\|/ / / /
* \| \| \|	Merge branch 'check-out-branch-button' into 'master'	Dmitriy Zaporozhets	2015-08-11	4	-11/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "Check out branch" button to the MR page. I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120. ![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png) It looks even better in combination with !1121, which gets rid of the "If you want to ..." line: ![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png) cc @dzaporozhets @rspeicher See merge request !1116
\| * \ \ \	Merge branch 'master' into check-out-branch-buttoncheck-out-branch-button	Douwe Maan	2015-08-10	43	-115/+320
\| \|\ \ \ \
\| * \| \| \| \|	Fix spec	Douwe Maan	2015-08-10	1	-1/+1
\| \| \| \| \| \|