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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Extract merge request widget JS to separate class	Dmitriy Zaporozhets	2015-06-11	11	-87/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Refactor merge request widget step 2	Dmitriy Zaporozhets	2015-06-11	17	-75/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Refactor accept merge request widget	Dmitriy Zaporozhets	2015-06-11	23	-191/+212
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-12	4	-5/+11
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'fix-graph-width' into 'master'	Dmitriy Zaporozhets	2015-06-12	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix graph width on different screen sizes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !802
\| \| * \| \| \| \| \| \| \| \|	Fix graph width on different screen sizesfix-graph-width	Dmitriy Zaporozhets	2015-06-11	1	-2/+2
\| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'fluid-commit-calendar' into 'master'	Dmitriy Zaporozhets	2015-06-12	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make commit calendar size depend on window size Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !801
\| \| * \| \| \| \| \| \| \|	Make commit calendar size depend on window sizefluid-commit-calendar	Dmitriy Zaporozhets	2015-06-11	1	-0/+1
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Merge branch 'rs-issue-1757' into 'master'	Dmitriy Zaporozhets	2015-06-11	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add negative tabindex to Markdown Write and Preview tabs Closes #1757 See merge request !796
\| \| * \| \| \| \| \| \| \|	Add negative tabindex to Markdown Write and Preview tabsrs-issue-1757	Robert Speicher	2015-06-10	1	-2/+2
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1757
\| * \| \| \| \| \| \| \|	Self build images require different build commands.	Sytse Sijbrandij	2015-06-11	1	-1/+6
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #9371 from zenati/patch-2	Dmitriy Zaporozhets	2015-06-11	6	-9/+11
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	An `in_namespace` scope is already present
\| * \| \| \| \| \| \|	An `in_namespace` scope is already present	zenati	2015-06-09	6	-9/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Sytse Sijbrandij	2015-06-11	2	-9/+10
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'rs-issue-1758' into 'master'	Dmitriy Zaporozhets	2015-06-11	2	-9/+10
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update grids for 2FA details Also adds a link to the documentation. Closes #1758 See merge request !795
\| \| * \| \| \| \| \| \|	Fix "Acount" typo in 2FA docsrs-issue-1758	Robert Speicher	2015-06-10	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| \| * \| \| \| \| \| \|	Update grids for 2FA details	Robert Speicher	2015-06-10	1	-6/+7
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also adds a link to the documentation.
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Sytse Sijbrandij	2015-06-11	1	-5/+5
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge pull request #9382 from stefan-it/stefan/docker-documentation-fx	Sytse Sijbrandij	2015-06-11	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	[Docker][Documentation] Uses correct docker image from Docker Hub
\| \| * \| \| \| \| \| \|	[Docker][Documentation] Uses new docker data image from Docker Hub ↵	Stefan Schweter	2015-06-11	1	-5/+5
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(sytse/gitlab-data). Uniform tag name for data image is now gitlab-data.
* \| \| \| \| \| \| \|	Merge branch 'info_about_namespaces' into 'master'	Job van der Voort	2015-06-11	1	-178/+192
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Info about namespaces Added info about namespaces in groups. Because of tweet https://twitter.com/kaystrobach/status/603912904757420032 See merge request !1835
\| * \| \| \| \| \| \|	added links to API calls	Karen Carias	2015-06-10	1	-191/+191
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fixed namespaces info	Karen Carias	2015-05-28	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	added info about namespaces	Karen Carias	2015-05-28	1	-0/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-importing-docs' into 'master'	Job van der Voort	2015-06-11	8	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix and minify images See merge request !1853
\| * \| \| \| \| \| \| \|	fix and minify images	Job van der Voort	2015-06-11	8	-4/+4
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Job van der Voort	2015-06-11	3	-0/+1
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'update-oauth-button-logos' into 'master'	Sytse Sijbrandij	2015-06-11	3	-0/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update oauth button logos for Twitter and Google Both new buttons are 64x64 renders of the recommended assets from each company. Refs for those recommendations are: - https://about.twitter.com/press/twitter-brand-policy - https://developers.google.com/identity/branding-guidelines Closes issue #544 [ci skip] Sign in UI before: ![sign-in-buttons-before](https://gitlab.com/fmborghino/gitlab-ce/uploads/ed42a056b23eb6db3907cb604a865ce5/sign-in-buttons-before.png) Sign in UI after: ![sign-in-buttons-after](https://gitlab.com/fmborghino/gitlab-ce/uploads/c7fb1d996fa744274298e195799bc033/sign-in-buttons-after.png) See merge request !798
\| \| * \| \| \| \| \| \|	Update oauth button logos for Twitter and Google	Max Borghino	2015-06-10	3	-0/+1
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Both new buttons are 64x64 renders of the recommended assets from each company. Refs for those are: - https://about.twitter.com/press/twitter-brand-policy - https://developers.google.com/identity/branding-guidelines Addresses issue #544
* \| \| \| \| \| \| \|	Merge branch 'fix-importing-docs' into 'master'	Job van der Voort	2015-06-11	13	-4/+4
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	move and fix links importing docs See merge request !1852
\| * \| \| \| \| \| \|	move and fix links importing docs	Job van der Voort	2015-06-11	13	-4/+4
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'project_settings_icons_alignment' into 'master'	Douwe Maan	2015-06-10	1	-5/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alignment of Project Settings nav icons. @douwe thanks for reviewing this small fix. ![before_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/ce213aa5b08c640ec5e9b018e0ec4036/before_after.png) See merge request !1848
\| * \| \| \| \| \|	Fix alignment of Project Settings nav icons.	Nicolas	2015-06-10	1	-5/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-project-edit' into 'master'	Dmitriy Zaporozhets	2015-06-10	1	-17/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve project edit form Properly align checkboxes according to bootstrap Before: ![Screenshot_2015-06-10_17.01.26](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2e874cc0a6edd52d98a17030f3d16f24/Screenshot_2015-06-10_17.01.26.png) After: ![Screenshot_2015-06-10_16.59.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d91ffe8e981f9bc57d9a18ce8ac79e2/Screenshot_2015-06-10_16.59.31.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !793
\| * \| \| \| \| \| \|	Improve project edit form	Dmitriy Zaporozhets	2015-06-10	1	-17/+25
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'rs-pre-rspec-3' into 'master'	Dmitriy Zaporozhets	2015-06-10	20	-56/+50
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes back-ported from rspec3 branch This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade. See merge request !792
\| * \| \| \| \| \| \|	Fix taskable requirers-pre-rspec-3	Robert Speicher	2015-06-10	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix shoulda-matchers require	Robert Speicher	2015-06-10	2	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use stub_const to stub constants instead of redefining them	Robert Speicher	2015-06-10	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They're called constants for a reason, after all.
\| * \| \| \| \| \| \|	Memoize result of JSON.parse in json_response	Robert Speicher	2015-06-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This might see a minor speedup in test cases that call this method many times.
\| * \| \| \| \| \| \|	Add `respond_to_missing?` for Commit and Repository	Robert Speicher	2015-06-10	2	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As of Ruby 1.9, this is the correct way to handle `respond_to?` for methods implemented by `method_missing`. See https://robots.thoughtbot.com/always-define-respond-to-missing-when-overriding
\| * \| \| \| \| \| \|	Add spec/support files for WebMock and test coverage	Robert Speicher	2015-06-10	3	-12/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Define GITORIOUS_HOST only once	Robert Speicher	2015-06-10	3	-4/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	"expect { }.not_to raise_error" no longer takes a specific class	Robert Speicher	2015-06-10	1	-6/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	ensure_length_of -> validate_length_of	Robert Speicher	2015-06-10	6	-11/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Bump shoulda-matchers and webmock gem versions	Robert Speicher	2015-06-10	2	-12/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-10	6	-20/+78
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'master' into 'master'	Dmitriy Zaporozhets	2015-06-10	5	-17/+74
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update fog to 1.25.0 and add multipart upload support This merge will fix backup uploading problems to s3, closing gitlab-org/gitlab-ce#1059 See merge request !789
\| \| * \| \| \| \| \| \| \|	use gitlab not gitlabci	Jeroen Nijhof	2015-06-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	remove extra space	Jeroen Nijhof	2015-06-09	1	-1/+0
\| \| \| \| \| \| \| \| \| \|