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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move broadcast msg into content-wrapper17485-broadcast-msg	Annabel Dunstone	2016-05-12	1	-1/+1
\|
*	Merge branch 'send-incremental-build-log' into 'master'	Jacob Schatz	2016-05-12	7	-65/+174
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
\| *	Fix specssend-incremental-build-log	Kamil Trzcinski	2016-05-12	1	-1/+1
\| \|
\| *	Merge remote-tracking branch 'origin/master' into send-incremental-build-log	Kamil Trzcinski	2016-05-10	190	-2902/+839
\| \|\
\| * \|	Encode state as base64 string	Kamil Trzcinski	2016-05-09	4	-22/+27
\| \| \|
\| * \|	Send trace to a browser incrementally when build is running	Kamil Trzcinski	2016-05-09	6	-58/+162
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
* \| \|	Merge branch 'update-changelog-875' into 'master'	Yorick Peterse	2016-05-12	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated CHANGELOG for 8.7.5 See merge request !4129
\| * \| \|	Updated CHANGELOG for 8.7.5	Yorick Peterse	2016-05-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \|	Merge branch '14272-forks-listed-when-permission-is-missing' into 'master'	Rémy Coutable	2016-05-12	2	-2/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show forks for users who can download code The ForksController enforces this, so don't show the link if it won't go anywhere. Closes #14272. See merge request !4017
\| * \| \|	Only show forks for users who can download code	Sean McGivern	2016-05-12	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ForksController enforces this, so don't show the link if it won't go anywhere.
* \| \| \|	Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master'	Rémy Coutable	2016-05-12	6	-47/+33
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reuse runners edit form in admin and project area Reuse runners edit form in admin and project area. ![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png) See merge request !4094
\| * \| \| \|	Use % notation for arrays in runner model constantsfix/reuse-runner-edit-form-in-admin-area	Grzegorz Bizon	2016-05-11	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Share form editable attributes mf runner via model	Grzegorz Bizon	2016-05-10	3	-2/+3
\| \| \| \| \|
\| * \| \| \|	Reuse runners edit form in admin and project area	Grzegorz Bizon	2016-05-10	3	-44/+29
\| \| \| \| \|
* \| \| \| \|	Merge branch 'total-method-time' into 'master'	Rémy Coutable	2016-05-12	3	-8/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed tracking of total method execution times See #17239 and 945c5b3fe6e0552f77da8b1a1efe75cd04434f53 for more details. The Grafana dashboards used to visualize performance data were updated a while ago to no longer display this data. See merge request !4124
\| * \| \| \| \|	Removed tracking of total method execution timestotal-method-time	Yorick Peterse	2016-05-12	3	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because method call timings are inclusive (that is, they include the time of any sub method calls) this would lead to the total method execution time often being far greater than the total transaction time. Because this is incredibly confusing it's best to simply _not_ track the total method execution time, after all it's not that useful to begin with. Fixes gitlab-org/gitlab-ce#17239
* \| \| \| \| \|	Merge branch '3870-commit-sorting-issue' into 'master'	Rémy Coutable	2016-05-12	2	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Group commits by date in server timezone `Time#to_date` just takes the (timezone-less) year, date, and month, and creates a new date from that. Because the commits in the list are grouped by date, rather than chunked when the date changes, a commit can be shown in the wrong order if its CommitDate has a timezone-less date that's different to other commits around it. Convert all CommitDates to the server timezone before grouping, as that will at least produce consistent results. Users can still see a timestamp on the commit that doesn't match the date it's grouped under, because the timestamp shown uses the user's local timezone, and the grouping uses the server's timezone, but that was an issue anyway. ### Before ![image](/uploads/1ffe0e2f86e03590cb96126d4f340436/image.png) ### After ![image](/uploads/b1be1b08782385d13c56528242a5829b/image.png) Closes #3870 and closes #17300. See merge request !4052
\| * \| \| \| \| \|	Group commits by date in server timezone3870-commit-sorting-issue	Sean McGivern	2016-05-11	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Time#to_date` just takes the (timezone-less) year, date, and month, and creates a new date from that. Because the commits in the list are grouped by date, rather than chunked when the date changes, a commit can be shown in the wrong order if its CommitDate has a timezone-less date that's different to other commits around it. Convert all CommitDates to the server timezone before grouping, as that will at least produce consistent results. Users can still see a timestamp on the commit that doesn't match the date it's grouped under, because the timestamp shown uses the user's local timezone, and the grouping uses the server's timezone, but that was an issue anyway.
* \| \| \| \| \| \|	Merge branch 'patch-2' into 'master'	Marin Jankovski	2016-05-12	1	-8/+11
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update cas.md to reflect the current syntax, and added that gitlab-ctl reconfigure should be run. I spent a while trying to figure our why the cas wasn't working! Someone may need to update the source code section of the wiki See merge request !3850
\| * \| \| \| \| \|	Update cas.md to reflect the current syntax, and added that gitlab-ctl ↵	Andrew Collett	2016-04-21	1	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reconfigure should be run.
* \| \| \| \| \| \|	Merge branch 'update-8-8-guides' into 'master'	Yorick Peterse	2016-05-12	2	-1/+155
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update 8.8 guides See merge request !4119
\| * \| \| \| \| \|	Update 8.8 guides	Valery Sizov	2016-05-11	2	-1/+155
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '16568-relative-links-wiki-regression' into 'master'	Rémy Coutable	2016-05-12	3	-3/+96
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relative Links in the Wiki Are Broken - [ ] #16568 (!4050) Relative links in wiki are broken - [x] Investigate issue - [x] Implementation / Fix - [x] Write (failing) tests for `WikiLinkFilter` - [x] Link to `./bar` should either get rewritten correctly or left alone - [x] Link to `./bar.md` should maybe get rewritten correctly (is left alone currently) - [x] Link to `bar.md` should get rewritten correctly - [x] Check if this indeed a bug - [x] Make sure CI is green - [x] Assign to endboss - [x] Wait for review - [x] Implement review feedback - [ ] Wait for merge See merge request !4050
\| * \| \| \| \| \| \|	Add CHANGELOG entry.	Timothy Andrew	2016-05-12	1	-0/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Implement @rymai's feedback after review.	Timothy Andrew	2016-05-12	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Separate 'exercise' and 'verify' steps of tests. - Use `build_stubbed` instead of `build`
\| * \| \| \| \| \| \|	Add a spec for `WikiLinkFilter`	Timothy Andrew	2016-05-12	2	-3/+85
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- And fix behavior for non-file hierarchical links.
* \| \| \| \| \| \|	Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master'	Douwe Maan	2016-05-11	8	-24/+111
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
\| * \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Long Nguyen	2016-05-11	213	-3147/+1276
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue_15572_snippets_tab_under_user_profile
\| * \| \| \| \| \| \| \|	Code improve	Long Nguyen	2016-05-10	2	-18/+19
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add specs for user routing and update spec for user controller	Long Nguyen	2016-05-08	2	-0/+59
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Routing refactoring	Long Nguyen	2016-05-08	6	-23/+20
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Long Nguyen	2016-05-08	181	-580/+1510
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue_15572_snippets_tab_under_user_profile
\| * \| \| \| \| \| \| \| \|	Fix routing error	Long Nguyen	2016-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	user routings refactor	Long Nguyen	2016-05-08	9	-32/+64
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Long Nguyen	2016-05-05	227	-1341/+3520
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issue_15572_snippets_tab_under_user_profile
\| * \| \| \| \| \| \| \| \| \|	Remove unused view and update redirect when destroy snippet	Long Nguyen	2016-05-05	2	-14/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove unused code, update spec, and update changelog	Long Nguyen	2016-05-05	3	-27/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add snippet tab under user profile	Long Nguyen	2016-05-02	4	-3/+39
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-remove-icon_for_event' into 'master'	Douwe Maan	2016-05-11	1	-9/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused `icon_for_event` helper Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4120
\| * \| \| \| \| \| \| \| \| \| \|	Remove unused `icon_for_event` helper	Robert Speicher	2016-05-11	1	-9/+0
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'no-todo-badge-on-zero' into 'master'	Jacob Schatz	2016-05-11	1	-2/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't show the Todo count if there aren't any Todos. When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying. Follow-up on !4077. Before: ![Screen_Shot_2016-05-10_at_9.36.57_PM](/uploads/e0dfafae01692286096606c3251f0997/Screen_Shot_2016-05-10_at_9.36.57_PM.png) After: ![Screen_Shot_2016-05-10_at_10.01.02_PM](/uploads/30a8bafe8f54862418eb4045e5777a9a/Screen_Shot_2016-05-10_at_10.01.02_PM.png) cc: @jschatz1 @rspeicher See merge request !4113
\| * \| \| \| \| \| \| \| \| \| \|	Don't show the Todo count if there aren't any Todos.	Connor Shea	2016-05-10	1	-2/+3
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying. Follow-up on !4077.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'hook-docs-behavior' into 'master'	Robert Speicher	2016-05-11	5	-6/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve documentation and web test for web hooks Tips and documentation of actual hook behavior. Improved user feedback when testing hooks via the web UI. See merge request !4015
\| * \| \| \| \| \| \| \| \| \|	Remove extra sanitization	Jacob Vosmaer	2016-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Robert Speicher and I believe this string gets sanitized further down the stack anyway. Doing this in a model class feels wrong.
\| * \| \| \| \| \| \| \| \| \|	Fix test failures	Jacob Vosmaer	2016-05-09	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove space	Jacob Vosmaer	2016-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Always mention HTTP status	Jacob Vosmaer	2016-05-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Inform user about questionable hook success	Jacob Vosmaer	2016-05-03	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Improve documentation and web test for web hooks	Jacob Vosmaer	2016-05-03	3	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I wanted to share what I learned trying to debug web hooks using netcat.
* \| \| \| \| \| \| \| \| \| \|	Merge branch '17356-remove-monkey_patch' into 'master'	Robert Speicher	2016-05-11	1	-48/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Rails monkey-patches now that we're using Rails 4.2.6 Closes #17356. See merge request !4115