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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use YAML inheritance to DRY the .gitlab-ci.ymlfaster-builds-ci	Z.J. van de Weg	2016-07-20	1	-19/+14
\|
*	Speed improvement for builds without DB	Z.J. van de Weg	2016-06-29	1	-8/+34
\| \| \| \| \| \|	Now the builds which do not use the DB or Redis won't pull the images from docker, and won't migrate the DB. This _should_ improve the build times slightly but also create a cleaner trace.
*	Merge branch 'filter-fade-fix' into 'master'	Jacob Schatz	2016-06-29	1	-2/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed fade when filtering results ## What does this MR do? Removes the `opacity` change when filtering results seeing as we now do `Turbolinks.visit` it isn't required. Best way to see issue - filter issues & then go back. Will still have opacity styling. See merge request !4932
\| *	Removed fade when filtering resultsfilter-fade-fix	Phil Hughes	2016-06-27	1	-2/+1
\| \|
* \|	Merge branch '14669-bugzilla-integration' into 'master'	Rémy Coutable	2016-06-29	9	-4/+97
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bugzilla Integration ## What does this MR do? Adds Bugzilla as a project service for external issue tracking ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Provides a notable Bugzilla option for use as an external issue tracker. Existing Custom Issue tracker can be used to setup Bugzilla but this makes it clear that Bugzilla is an option. ## What are the relevant issue numbers? Closes #14669 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4930
\| * \|	Moved CHANGELOG entry up to help avoid future conflicts	Tim	2016-06-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	rebased with latest changes from master
\| * \|	Removed redudant methods implemented by parent class	Tim	2016-06-29	2	-15/+0
\| \| \|
\| * \|	Set field defaults to be the same as IssueTrackerService	Tim	2016-06-29	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Rebased to resolve merge conflicts
\| * \|	Added Bugzilla as external issue tracker option	Tim	2016-06-29	8	-1/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Requested in #14669 Added note to changelog
* \| \|	Merge branch 'fograckspace' into 'master'	Stan Hu	2016-06-29	2	-0/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add fog-rackspace microgem to support backups using rackspace provider ## What does this MR do? Adds fog-rackspace gem to Gemfile. ## Why was this MR needed? Because fog moved the rackspace provider to separate gem. ## What are the relevant issue numbers? #19197 See merge request !4986
\| * \| \|	Add fog-rackspace microgem to support backups using rackspace provider.	jbub	2016-06-29	2	-0/+7
\| \| \| \|
* \| \| \|	Merge branch '18663-avoid-extra-yaml-serializations' into 'master'	Yorick Peterse	2016-06-29	2	-10/+38
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use update_columns to by_pass all the dirty code on active_record See merge request !4985
\| * \| \| \|	Use update_columns to by_pass all the dirty code on active_record	Paco Guzman	2016-06-29	2	-10/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We think this is valid because we’re just storing new data that always will be valid
* \| \| \| \|	Merge branch 'make-max-member-access-faster' into 'master'	Yorick Peterse	2016-06-29	3	-12/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce overhead and optimize ProjectTeam#max_member_access performance See merge request !4973
\| * \| \| \|	Reduce overhead and optimize ProjectTeam#max_member_access performance	Stan Hu	2016-06-29	3	-12/+4
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous implementation would load the entire team member list and their respective attributes. Now we only search for the user's specific access level. In gitlab-com/operations#42, this reduces the overall overhead of rendering the issue from 28% to 20%. First step of optimizing #19273
* \| \| \|	Merge branch '19318-pipelines-find-git-calls' into 'master'	Yorick Peterse	2016-06-29	2	-2/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PipelinesFinder use git cached data See merge request !4984
\| * \| \| \|	PipelinesFinder use git cached data19318-pipelines-find-git-calls	Paco Guzman	2016-06-29	2	-2/+3
\| \|/ / /
* \| \| \|	Merge branch '17295_discussion_note' into 'master'	Jacob Schatz	2016-06-29	2	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes missing avatar on system notes Closes #17295 ![Screen_Shot_2016-06-27_at_12.50.50_PM](/uploads/b142226e608ccfe751a9b6059f57c9ec/Screen_Shot_2016-06-27_at_12.50.50_PM.jpg) See merge request !4954
\| * \| \| \|	Update CHANGELOG17295_discussion_note	Alfredo Sumaran	2016-06-28	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Display user avatar inside of .discussion-body	Alfredo Sumaran	2016-06-28	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'md-toolbar-multiline-code' into 'master'	Jacob Schatz	2016-06-29	2	-12/+37
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Markdown toolbar inserts code blocks ## What does this MR do? Adds the ability to insert code blocks with the markdown toolbar buttons. This is done by selecting the block & then clicking the code button. ## What are the relevant issue numbers? Closes #19173 See merge request !4950
\| * \| \| \|	Markdown toolbar inserts code blocksmd-toolbar-multiline-code	Phil Hughes	2016-06-27	2	-12/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19173
* \| \| \| \|	Merge branch 'new-mr-avatar-alignment' into 'master'	Jacob Schatz	2016-06-29	1	-1/+8
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed avatar alignment in new MR view ## What does this MR do? Fixes the alignment of the avatar in new MR view. Closes #19076 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_12.53.58](/uploads/fc94faf2e48f194852693b7ae79e8fa3/Screen_Shot_2016-06-24_at_12.53.58.png) See merge request !4901
\| * \| \| \|	Fixed avatar alignment in new MR viewnew-mr-avatar-alignment	Phil Hughes	2016-06-24	1	-1/+8
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-workhorse-format-patch' into 'master'	Robert Speicher	2016-06-29	6	-24/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Workhorse to serve email diffs See merge request !4590
\| * \| \| \| \|	Bump workhorse versionzj-workhorse-format-patch	Z.J. van de Weg	2016-06-28	2	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Workhorse to serve email diffs	Z.J. van de Weg	2016-06-28	5	-23/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Depends on the changes in Workhorse (gitlab-org/gitlab-workhorse!48).
* \| \| \| \| \|	Merge branch 'system-info' into 'master'	Josh Frye	2016-06-29	9	-2/+65
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show basic system info on admin panel. Closes #18886 ![Screen_Shot_2016-06-23_at_10.57.07_AM](/uploads/df33bc3dc36ceaf86f5e479ca15b83f3/Screen_Shot_2016-06-23_at_10.57.07_AM.png) See merge request !4858
\| * \| \| \| \| \|	Add specssystem-info	Josh Frye	2016-06-28	1	-0/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Change load average to cpu/cores on system info.	Josh Frye	2016-06-28	2	-3/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Use number_to_human_size for system info and remove dependency on Filesize gem.	Josh Frye	2016-06-28	5	-10/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Round figures for system info	Josh Frye	2016-06-28	2	-6/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Ensure Monitoring tab is highlighted	Josh Frye	2016-06-28	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix styling	Josh Frye	2016-06-28	3	-5/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Show basic system info on admin panel. Closes #18886	Josh Frye	2016-06-28	6	-0/+47
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'fix/group-visibility-ui-in-app-settings' into 'master'	Jacob Schatz	2016-06-28	2	-1/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix group visibility form layout in application settings ## What does this MR do? This fixes UI consistency related to setting group visibility levels in application settings. See screenshots. ## Screenshots (if relevant) #### Before ![visiblity_consistency](/uploads/9cf9b517e25cd661ac61bdd7ca2d82f4/visiblity_consistency.png) #### After ![group_visibility_after](/uploads/7b317684d047716f2aa5e60d19a4281b/group_visibility_after.png) See merge request !4848
\| * \| \| \| \| \|	Add Changelog entry for group visibility fix in settings	Grzegorz Bizon	2016-06-28	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix group visibility UI consistency in settings	Grzegorz Bizon	2016-06-28	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #18949
* \| \| \| \| \|	Merge branch ↵	Jacob Schatz	2016-06-28	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'18942-dropdowns-should-apply-any-present-filter-once-data-is-loaded' into 'master' Fixed dropdown not filtering queries entered before data is loaded ## What does this MR do? Triggers a 'keyup' event on a filters input to force it to process any text that was added before the data was retrieved and rendered. ## Are there points in the code the reviewer needs to double check? :confused: ## Why was this MR needed? UX ## What are the relevant issue numbers? Closes #18942. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4846
\| * \| \| \| \| \|	forced filter input to process inputs after data has loaded18942-dropdowns-should-apply-any-present-filter-once-data-is-loaded	Luke "Jared" Bennett	2016-06-22	1	-0/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update CHANGELOG for 8.8.6 and 8.7.8	Robert Speicher	2016-06-28	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'as-fix-changelog' into 'master' 18999-switch-labels-and-weight	Jacob Schatz	2016-06-28	1	-1/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG Fixes double header for 8.9.3 entries See merge request !4971
\| * \| \| \| \| \| \|	Fix CHANGELOGas-fix-changelog	Alfredo Sumaran	2016-06-28	1	-1/+0
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/builds-api-builds-for-commit-search' into 'master'	Rémy Coutable	2016-06-28	4	-15/+58
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find all builds for commit if there are multiple pipelines for it ## What does this MR do? This MR fixes a builds API. When multiple pipelines were triggered for a commit, then API returned builds only from the last pipeline. ## What are the relevant issue numbers? Closes #18912 Closes #19243 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4849
\| * \| \| \| \| \| \|	Remove redundant check in commit builds API endpointfix/builds-api-builds-for-commit-search	Grzegorz Bizon	2016-06-28	1	-2/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add documentation for commit builds API improvements	Grzegorz Bizon	2016-06-28	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add Changelog entry for commit builds API fix	Grzegorz Bizon	2016-06-28	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve commit builds API endpoint RESTful behavior	Grzegorz Bizon	2016-06-28	2	-16/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1. Return 404 if commit is not found (RESTful resource not found) 2. Return an empty array if pipeline is not found (resource present, no associated builds found) 3. Return an empty array if pipeline found but no builds there (resource present, no associated builds)
\| * \| \| \| \| \| \|	Find all builds for commit if multiple pipelines	Grzegorz Bizon	2016-06-28	2	-5/+9
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'performance-clock-adjustments' into 'master'	Robert Speicher	2016-06-28	5	-21/+48
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use clock_gettime for all performance timestamps This MR adjusts the performance monitoring code to use `Process.clock_gettime` (thus `clock_gettime(3)`) instead of `Time.now`. Using `Time.now` / `Time.new` adds more overhead than `Process.clock_gettime`, it also doesn't provide a way of getting timestamps in nanoseconds (which `Process.clock_gettime` does allow). See merge request !4899