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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into issue_3945	Rubén Dávila	2016-01-14	4	-5/+10
\|\
\| *	add missing padding for commit -> builds page	Dmitriy Zaporozhets	2016-01-14	1	-1/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Update files/diffs to match new layout	Dmitriy Zaporozhets	2016-01-14	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Replace all navigation menu with nav-links class	Dmitriy Zaporozhets	2016-01-13	2	-2/+4
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Add Open Graph data for group, project and commit.	Douwe Maan	2015-12-25	1	-1/+3
\| \|
* \|	Change strategy to highlight diffs. #3945	Rubén Dávila	2016-01-07	1	-1/+2
\|/ \| \| \| \|	Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
*	Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if ↵	Kamil Trzcinski	2015-12-17	1	-1/+1
\| \| \| \|	the builds are enabled
*	Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixes	Robert Speicher	2015-12-15	1	-2/+2
\|
*	Merge branch 'master' into ux/suppress-ci-yml-warning	Grzegorz Bizon	2015-12-14	1	-9/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (24 commits) Fix runners admin view Fix migrations Run builds from projects with enabled CI Use Gitlab::Git instead of Ci::Git Fix last specs Fix specs Fix after column rename Fix errors Update badge Finishing touches Fix triggers tests Rename columns and rename migrations Reimplement Trigger API Remove ci_ prefix from all ci related things Add runners token Migrate CI::Project to Project Fix indentation and BuildsEmailService Change default values Enhance migrate CI emails Fix issue tracker service ... Conflicts: spec/features/commits_spec.rb
\| *	Fix specs	Kamil Trzcinski	2015-12-11	1	-4/+4
\| \|
\| *	Fix errors	Kamil Trzcinski	2015-12-11	1	-1/+1
\| \|
\| *	Finishing touches	Kamil Trzcinski	2015-12-11	1	-0/+1
\| \|
\| *	Migrate CI::Project to Project	Kamil Trzcinski	2015-12-11	1	-9/+9
\| \|
* \|	Do not display ci build status if builds enabled but no `.gitlab-ci.yml`	Grzegorz Bizon	2015-12-14	1	-1/+1
\|/ \| \| \|	Ref #3827
*	Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching	Douwe Maan	2015-12-10	3	-68/+69
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb
\| *	Merge branch 'master' into mr-builds	Douwe Maan	2015-12-08	1	-2/+3
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/views/projects/merge_requests/widget/_heading.html.haml
\| * \|	Move commit builds to partial	Douwe Maan	2015-12-08	3	-68/+69
\| \| \|
* \| \|	Merge branch 'reference-pipeline-and-caching' into 'master'	Robert Speicher	2015-12-08	1	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement different Markdown rendering pipelines and cache Markdown Builds on !1090. Related to !1014. Fixes #2054. See merge request !1602
\| * \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-12-03	3	-4/+8
\| \|\ \ \| \| \|/
\| * \|	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-11-19	4	-11/+16
\| \|\ \
\| * \ \	Merge branch 'master' into reference-pipeline-and-caching	Douwe Maan	2015-10-21	1	-23/+25
\| \|\ \ \
\| * \ \ \	Merge branch 'master' into rs-redactor-filter	Douwe Maan	2015-10-14	1	-28/+33
\| \|\ \ \ \
\| * \| \| \| \|	Use Gitlab::Markdown.render with :pipeline option rather than different methods	Douwe Maan	2015-10-14	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into ui/misc	Douwe Maan	2015-12-03	3	-4/+8
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'ui/consistency' into 'master'	Dmitriy Zaporozhets	2015-12-02	1	-2/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI: Improve consistency across the board Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577 See merge request !1954
\| \| * \| \| \| \|	Brefer "Directory" over "Dir", "Files" over "Codeui/consistency	Douwe Maan	2015-12-02	1	-2/+3
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Remove double border between gray blocks	Douwe Maan	2015-12-02	1	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Remove duplicated styling for center top menus	Douwe Maan	2015-12-02	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Add clipboard button to commit box SHA	Douwe Maan	2015-12-02	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	"CI build passed", not "CI build success"	Douwe Maan	2015-12-02	1	-1/+1
\|/ / / /
* \| \| \|	Don't use params[:view] directly.param-view	Douwe Maan	2015-11-17	1	-1/+1
\| \| \| \|
* \| \| \|	Replace CoffeeScript block into JavaScript in Views.	Jason Lee	2015-11-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For example view: shared/issuable/_context CoffeeScript: 190ms JavaScript: 19.7ms
* \| \| \|	Add missing stage to builds view	Kamil Trzcinski	2015-11-05	1	-1/+1
\| \| \| \|
* \| \| \|	CI details cleanup	Kamil Trzcinski	2015-11-05	3	-7/+12
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add page titles to CI settings. - Fix CI admin navigation. - Remove duplicated scope. - Use monospace font for commit sha. - Add page title and header title to build page. - Proper authorization for cancel/retry builds. - Use gitlab pagination theme for builds and group members. - Don't paginate builds widget on build page. - Add badges to commit page Changes/Builds tabs. - Add "Builds" to commit Builds tab page title. - Add and use Ci::Build#retryable? method. - Add CI::Build#retried? method. - Allow all failed commit builds to be retried. - Proper authorization for cancel/retry all builds. - Remove unused param. - Use time_ago_with_tooltip where appropriate. - Tweak builds index text - Remove duplication between builds/build and commit_statuses/commit_status. - Use POST rather than GET for canceling and retrying builds. - Remove redundant URL helpers. - Add build ID to build page. - Link branch name on build page. - Move commit/:sha/ci to commit/:sha/builds.
* \| \|	Make tables full width.	Douwe Maan	2015-10-19	1	-23/+25
\| \|/ \|/\|
* \|	Fix retry and cancel for buildfix-retry-and-cancel	Kamil Trzcinski	2015-10-14	1	-9/+13
\| \|
* \|	Fix feature tests	Kamil Trzcinski	2015-10-12	1	-1/+1
\| \|
* \|	Update rendering	Kamil Trzcinski	2015-10-12	1	-44/+23
\| \|
* \|	Implement Commit Status API	Kamil Trzcinski	2015-10-12	1	-7/+29
\| \|
* \|	Remove Ci::Commit and Ci::Build controllerscleanup-ci-pages	Dmitriy Zaporozhets	2015-10-07	1	-1/+1
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Move CI build page to CE project	Dmitriy Zaporozhets	2015-10-06	1	-2/+2
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Render CI statuses on commit page	Dmitriy Zaporozhets	2015-10-06	3	-0/+70
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Show CI status on commit page	Dmitriy Zaporozhets	2015-09-24	1	-0/+7
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Move project header title definition to view in question.	Douwe Maan	2015-09-17	1	-0/+1
\|
*	Improve commit page style	Dmitriy Zaporozhets	2015-09-08	1	-1/+1
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Support commenting on a diff in side-by-side view	Stan Hu	2015-06-16	1	-1/+1
\| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9283
*	Include commit message in page title.	Douwe Maan	2015-04-30	1	-1/+1
\|
*	Add a page title to every page.	Douwe Maan	2015-04-30	1	-0/+1
\|
*	Merge branch 'fix-plain-diffs' into 'master'	Dmitriy Zaporozhets	2015-03-29	1	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the email patches link for merge commits Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches. This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit. Together these changes should prevent the 500 errors described in the issue. cc @sytse See merge request !1737
\| *	Remove the email patches link for merge commits	Vinnie Okada	2015-03-23	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download merge commits as email patches.