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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8	Annabel Dunstone Gray	2017-09-11	2	-0/+8
\| \| \|	This reverts merge request !14148
*	Merge branch 'sh-filter-runner-token' into 'master'	Robert Speicher	2017-09-11	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Expand filtered parameters to include `token` See merge request !14174
\| *	Expand filtered parameters to include `token`sh-filter-runner-token	Stan Hu	2017-09-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \|	Now that we are logging API requests in `api_json.log`, we see that the runner token was not filtered properly.
* \|	Merge branch ↵	Tim Zallmann	2017-09-11	1	-10/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37644-update-prometheus-metric-library-to-support-multiple-series-and-colors' into 'master' Update Prometheus Metric Library to support multiple series and colors Closes #37644 See merge request !14155
\| * \|	Fix ingress query	Joshua Lambert	2017-09-09	1	-2/+3
\| \| \|
\| * \|	Update k8s metrics and docs	Joshua Lambert	2017-09-08	1	-1/+1
\| \| \|
\| * \|	Update queries for colors and series	Joshua Lambert	2017-09-08	1	-10/+37
\| \| \|
* \| \|	Read import sources from setting at first initialization	Visay Keo	2017-09-09	1	-1/+1
\| \|/ \|/\|
* \|	Revert "Merge branch ↵revert-f2421b2b	Rubén Dávila	2017-09-08	2	-8/+0
\|/ \| \| \| \|	'35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
*	Merge remote-tracking branch 'origin/master' into ↵	Kamil Trzcinski	2017-09-07	4	-13/+22
\|\ \| \| \| \| \| \|	zj/gitlab-ce-zj-auto-devops-table
\| *	Merge branch ↵	Sean McGivern	2017-09-07	2	-0/+8
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
\| \| *	Fix specs; start on light theme	Annabel Dunstone Gray	2017-09-06	1	-1/+3
\| \| \|
\| \| *	Add blue theme	Annabel Dunstone Gray	2017-09-06	1	-0/+1
\| \| \|
\| \| *	Add functionality for two themes	Annabel Dunstone Gray	2017-09-06	1	-8/+4
\| \| \|
\| \| *	Restore some changes from !9199	Rubén Dávila	2017-09-06	2	-1/+10
\| \| \|
\| * \|	Merge branch 'ee_issue_928_backport' into 'master'	Sean McGivern	2017-09-07	2	-13/+14
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \|	Group boards CE backport See merge request !13883
\| \| *	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Simon Knox	2017-09-06	12	-34/+41
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	ee_issue_928_backport
\| \| * \|	Group boards CE backport	Felipe Artur	2017-08-28	2	-13/+14
\| \| \| \|
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵	Kamil Trzcinski	2017-09-06	3	-7/+24
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \|	zj/gitlab-ce-zj-auto-devops-table
\| * \| \|	Merge branch ↵	Douwe Maan	2017-09-06	1	-3/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
\| \| * \| \|	Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-list	Tiago Botelho	2017-09-06	1	-3/+0
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Profile updates from providers	Alexander Keramidas	2017-09-06	2	-4/+24
\| \|/ /
* \| \|	Merge branch 'master' into zj-auto-devops-table	Zeger-Jan van de Weg	2017-09-06	4	-2/+15
\|\ \ \ \| \|/ /
\| * \|	Move `common_vue` into vendor bundle	kushalpandya	2017-09-05	1	-1/+1
\| \| \|
\| * \|	Merge branch 'forbid-fb-bsd-patents' into 'master'	Douwe Maan	2017-09-04	1	-0/+6
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Facebook BSD+PATENTS license to the "unacceptable" list See merge request !14029
\| \| * \|	Add Facebook BSD+PATENTS license to the "unacceptable" list	Nick Thomas	2017-09-04	1	-0/+6
\| \| \| \|
\| * \| \|	Increase the timeout before aborting a storage access attemptbvl-increase-storage-check-timeout	Bob Van Landuyt	2017-09-04	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	There are peaks of IO-wait time, most of them stay below 30 seconds.
\| * \|	Merge branch '34261-move-move-to-sidebar' into 'master'	Grzegorz Bizon	2017-09-04	1	-0/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move "Move issue" to sidebar Closes #34261 See merge request !13616
\| \| * \|	Move "Move to different project" to sidebar34261-move-move-to-sidebar	Eric Eastwood	2017-09-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
\| * \| \|	Merge branch 'approve-unlicense' into 'master'	Douwe Maan	2017-09-04	1	-0/+6
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Approve the Unlicense See merge request !14001
\| \| * \|	Approve the Unlicense	Nick Thomas	2017-09-01	1	-0/+6
\| \| \| \|
* \| \| \|	Incorporate review	Zeger-Jan van de Weg	2017-09-04	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into zj-auto-devops-table	Zeger-Jan van de Weg	2017-09-04	4	-1/+8
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch 'issue-discussions-refactor' into 'master'	Jacob Schatz	2017-09-02	2	-0/+3
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	Issue discussions Vue refactor See merge request !12069
\| \| * \|	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-08-31	5	-31/+14
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/issue.rb
\| \| * \ \	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-08-30	6	-7/+12
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/issue.rb
\| \| * \ \ \	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-08-23	5	-16/+13
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # package.json
\| \| * \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-08-17	12	-16/+104
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
\| \| * \ \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Filipa Lacerda	2017-08-10	4	-4/+7
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (42 commits) alternative route for download archive Add missing command to compile GetText files Prevent user from changing username with container registry tags Rename RPC 'Exists' to 'RepositoryExists' Fix the sticky changes bar on commits page Fix ee_compat_check when EE branch uses a prefix Removed display styles when hiding the fly out navigation Explain why we use select all for project_url_constrainer.rb Fix pikaday being undefined Add a helper to stub storage settings with defaults Enable the Layout/SpaceBeforeBlockBraces cop update Install from Source instructions Translations can be picked without asking for exceptions Ask for exceptions in advance Don't require stackprof in Gemfile Synchronous Korean translation in zanata Use full path of user's avatar in webhooks Update icon color on hover Align all nav items in sidebar Fix height of collapsed sidebar items ...
\| \| * \ \ \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Filipa Lacerda	2017-08-08	9	-9/+119
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (481 commits) Make sure that we have author and committer disable file upload button while uploading Fix bar chart does not display label at hour 0 Fixed activity not loading on project homepage Expose noteable_iid in Note Fix fly-out width when it has long items Add a test to show that threshold 40 would corrupt Add changelog entry Raise encoding confidence threshold to 50 Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/` Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/` Add Italian translations of Pipeline Schedules Restrict InlineJavaScript for haml_lint to dev and test environment Incorporate Gitaly's CommitService.FindCommit RPC Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit fix repo_edit_button_spec.js fix test failures in repo_preview_spec.js fix repo_loading_file_spec tests Refactor Gitlab::Git::Commit to include a repository use 100vh instead of flip flopping between the two - works on all suported browsers ...
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Filipa Lacerda	2017-08-07	1	-1/+4
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (21 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix order of CI lint ace editor loading Fix spec Fix spec Fix spec Add changelog fix Add a spec for concurrent process Add changelog essential add CHANGELOG.md for !13208 adjust user contribution calendar time formatting fix rubocop violations 👮 fix mysql syntax for date INTERVAL arithmatic add tests for proper timezone date grouping within ContributionsCalendar adjust timezone for date grouping in contributions calendar use timezone-aware Date.current instead of Date.today in ContributionsCalendar class display system timezone underneath activity calendar ...
\| \| * \ \ \ \ \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Filipa Lacerda	2017-08-04	2	-3/+3
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (162 commits) Since mysql is not a priority anymore, test it less Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Install yarn via apt in update guides Use long curl options Remove monkey-patched Array.prototype.first() and last() methods Openshift Getting Started 35659 Rename Pipelines tab to CI / CD in new navigation Don't bother going through an entire Banzai pipeline for empty text Add active state for pipelines settings on old nav Bump rspec to 3.6.0 Resolve "Specific Async Script Loading by using a Page Variable" Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'" another rubocop style fix Use mixin for new dropdown style Migrate Repository#last_commit_for_path to Gitaly Migrate blame loading to Gitaly ...
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Filipa Lacerda	2017-08-01	2	-2/+10
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (76 commits) Add code review guidelines related to Build [CI skip]. Make time span dropdown style on cycle analytics page consistent Add 204. Remove duplicated method. Make sure we didn't commit conflicts Fix bug in blob test Always fetch branches before finding the merge base, otherwise we could find an outdated merge base Fixes dropdown margin in sidebar Docs add blog articles Inline script cleanup globals and easy Add option to use CommitLanguages RPC CI fixes for gitaly-ruby fix Allow logged in users to read user list under public restriction Small refactor in LegacyNamespace and moved back send_update_instructions Rename ensure_dir_exist -> ensure_storage_path_exist Added some extra TODOs for the Legacy Storage refactor Make disk_path keyword argument and optional Rename more path_with_namespace -> full_path or disk_path Rename path_with_namespace -> disk_path when dealing with the filesystem Rename many path_with_namespace -> full_path ...
\| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into issue-discussions-refactor	Douwe Maan	2017-07-31	18	-37/+187
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/concerns/notes_actions.rb # spec/features/task_lists_spec.rb # spec/support/features/issuable_slash_commands_shared_examples.rb
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add full JSON endpoints for issue notes and discussions	Douwe Maan	2017-07-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Notes bundle for the issue discussions refactor.	Fatih Acet	2017-07-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-validate-po-files' into 'master'	Douwe Maan	2017-09-01	1	-1/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate PO files in static analysis See merge request !13000
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Ignore fuzzy translations	Bob Van Landuyt	2017-08-31	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '36061-mr-ref-instrument' into 'master'	Sean McGivern	2017-09-01	1	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument MergeRequest#fetch_ref See merge request !13980
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Instrument MergeRequest#fetch_ref36061-mr-ref-instrument	Jarka Kadlecova	2017-09-01	1	-0/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \|