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

	Commit message (Collapse)	Author	Age	Files	Lines
*	removes unused `alert` from issue spec. Requires flash in the ↵close-open-ajax-issue	Jacob Schatz	2015-12-23	2	-8/+2
\| \| \| \|	implementation instead of the spec.
*	adds test for issue close/reopen failure	Jacob Schatz	2015-12-23	2	-4/+60
\|
*	resolves conflicts with new buttons	Jacob Schatz	2015-12-23	20	-57/+576
\|\
\| *	Merge branch 'add-project-permissions' into 'master'	Dmitriy Zaporozhets	2015-12-23	1	-0/+13
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add project permissions to all project API endpoints This standardizes all the project API formats. Also needed to support Huboard. See merge request !2090
\| \| *	Add project permissions to all project API endpoints	Stan Hu	2015-12-22	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|	This standardizes all the project API formats. Also needed to support Huboard.
\| * \|	Merge branch 'fix/ci-runners-token-persistence' into 'master'	Grzegorz Bizon	2015-12-23	3	-8/+18
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix method that ensures authentication token Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database. This closes #4235. See merge request !2185
\| \| * \|	Use method that creates runners registration token	Grzegorz Bizon	2015-12-23	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`runners_registration_token` now creates a new token if it is blank.
\| \| * \|	Add method that persist ensured token in `TokenAuthenticatable`	Grzegorz Bizon	2015-12-23	1	-6/+13
\| \| \| \|
\| \| * \|	Fix method that ensures authentication token	Grzegorz Bizon	2015-12-23	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Until now, `ensure_#{token_filed_name}` method didn't persist new token in database. This closes #4235.
\| * \| \|	Merge branch 'improve_emoji_picker' into 'master'	Dmitriy Zaporozhets	2015-12-23	1	-12/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve emoji picker This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well. Some categories are pretty poor, it can be extended in the future. It's a first step on the way to improve picker. The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution. ![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png) See merge request !2172
\| \| * \| \|	fix specs	Valery Sizov	2015-12-22	1	-6/+0
\| \| \| \| \|
\| \| * \| \|	base implementation of emoji picker [ci skip]	Valery Sizov	2015-12-22	1	-6/+0
\| \| \|/ /
\| * \| \|	Merge branch 'fix/ci-lint' into 'master'	Grzegorz Bizon	2015-12-23	2	-28/+39
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make CI Lint form synchronous This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. See merge request !2171
\| \| * \|	Make CI Lint form synchronousfix/ci-lint	Grzegorz Bizon	2015-12-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes `remote: true` from CI Lint form, making it synchronous form. This also removes some complexity related to displaying lint messages. View also has been updated, removed deprecated Bootstrap 2 tags. Improved design. Closes #4206
\| \| * \|	Rename CI lint specs file	Grzegorz Bizon	2015-12-22	1	-0/+0
\| \| \| \|
\| \| * \|	Improve CI Lint specs (refactoring)	Grzegorz Bizon	2015-12-22	1	-18/+29
\| \| \|/
\| * \|	Merge branch 'fix_leave_project_display' into 'master'	Stan Hu	2015-12-22	2	-0/+24
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix and test leave project display The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. This fixes the display and also adds 2 different tests for it. cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you! See merge request !2166
\| \| *	Fix and test leave project display	Drew Blessing	2015-12-21	2	-0/+24
\| \| \|
\| * \|	Move `ci_build_details_path` helper spec to correct location	Robert Speicher	2015-12-21	2	-22/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Also, make it not fail.
\| * \|	removes api credentials from link to build_page	Marvin Frick	2015-12-22	1	-0/+22
\| \|/ \| \| \| \| \| \| \| \|	Also adds a spec for MergeRequestHelper to avoid having a regression later on.
\| *	Merge branch 'add_email_unlock' into 'master'	Robert Speicher	2015-12-21	1	-0/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow account unlock via email We see a lot of users get confused about what it means when your account gets locked. Many try to reset their password and are still faced with a lockout. With this change, users receive an email that allows them to unlock their account immediately. The previous behavior where the account is auto-unlocked after a time also still works. See merge request !2049
\| \| *	Allow account unlock via email	Drew Blessing	2015-12-14	1	-0/+1
\| \| \|
\| * \|	Merge branch 'issue_3452'	Douwe Maan	2015-12-21	1	-0/+64
\| \|\ \
\| \| * \|	Fix broken spec. #3452	Rubén Dávila	2015-12-16	1	-1/+1
\| \| \| \|
\| \| * \|	Add link to MR from Build detail page. #3452	Rubén Dávila	2015-12-16	1	-0/+64
\| \| \| \|
\| * \| \|	Merge branch 'coverage-regex' into 'master'	Douwe Maan	2015-12-21	1	-0/+6
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix build coverage regex matching to allow captures. Fixes #2644 /cc @DouweM See merge request !2138
\| \| * \| \|	Fix build coverage regex.	Jared Szechy	2015-12-20	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a spec for regex captures as well. Fixes #2644
\| * \| \| \|	Backport JIRA service	Drew Blessing	2015-12-18	9	-9/+391
\| \| \| \| \|
* \| \| \| \|	fixes tests to work with jasmine/jquery	Jacob Schatz	2015-12-23	2	-13/+16
\| \| \| \| \|
* \| \| \| \|	adds alerts for when http request errors out in some way.	Jacob Schatz	2015-12-21	1	-10/+1
\| \| \| \| \|
* \| \| \| \|	clarifies tests with methods like `toBeVisible()` etc.	Jacob Schatz	2015-12-21	1	-12/+9
\| \| \| \| \|
* \| \| \| \|	updates tests style for four-phase-testing as per: ↵	Jacob Schatz	2015-12-21	1	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://robots.thoughtbot.com/four-phase-test
* \| \| \| \|	open and close issue via ajax request. With tests	Jacob Schatz	2015-12-21	2	-1/+40
\|/ / / /
* \| \| \|	Fix feature specs: we always show the build status if ci_commit is presentci-commit-status-skipped	Kamil Trzcinski	2015-12-17	1	-23/+6
\| \| \| \|
* \| \| \|	Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if ↵	Kamil Trzcinski	2015-12-17	1	-6/+11
\|/ / / \| \| \| \| \| \| \| \| \|	the builds are enabled
* \| \|	Merge branch 'api-support-starred-projects' into 'master'	Dmitriy Zaporozhets	2015-12-16	1	-1/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Api support for requesting starred projects for user Closes #4112 Note: probably targets the wrong release in the `CHANGELOG`, though 8.4 was not there yet See merge request !2127
\| * \| \|	Api support for requesting starred projects for user	Zeger-Jan van de Weg	2015-12-16	1	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4112
* \| \| \|	Merge branch 'master' into fix-merge-immediately-button	Douwe Maan	2015-12-16	1	-8/+3
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge remote-tracking branch 'origin/rs-simplify-status-icon'	Dmitriy Zaporozhets	2015-12-16	1	-8/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Define CI status icon colors in SCSS instead of a helperrs-simplify-status-icon	Robert Speicher	2015-12-12	1	-8/+3
\| \| \| \| \|
* \| \| \| \|	Fix updating and disabling merge button when Merge Immediately is clicked	Douwe Maan	2015-12-16	1	-3/+3
\|/ / / /
* \| \| \|	Merge branch 'fix-milestone-snippet-header' into 'master'	Dmitriy Zaporozhets	2015-12-16	4	-6/+6
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix headers of milestone and snippet show pages Fix layout, and move "Edit" button to very right just like issue/MR. Before: ![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png) ![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png) After: ![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png) ![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png) cc @skyruler cc @rspeicher 8.3 please! See merge request !2104
\| * \| \|	Rename .issuable-details to .detail-page (and -header and -description)	Douwe Maan	2015-12-16	4	-6/+6
\| \| \| \|
* \| \| \|	Merge branch 'add-open-issues-count-to-api' of ↵	Dmitriy Zaporozhets	2015-12-16	2	-1/+21
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/stanhu/gitlab-ce Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Add open_issues_count to project API	Stan Hu	2015-12-11	2	-1/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is needed to support Huboard and a generally useful value.
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-12-16	1	-3/+4
\|\ \ \ \
\| * \ \ \	Merge branch 'rs-timeago' into 'master'	Douwe Maan	2015-12-16	1	-3/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix time_ago_with_tooltip for activity feed Closes #4002 See merge request !2074
\| \| * \| \| \|	Fix time_ago_with_tooltip for activity feedrs-timeago	Robert Speicher	2015-12-11	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #4002
* \| \| \| \| \|	Merge remote-tracking branch 'origin/feature/update-rubocop'	Dmitriy Zaporozhets	2015-12-16	16	-64/+65
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fixed Rubocop offenses	Gabriel Mazetto	2015-12-15	16	-64/+65
\| \| \|_\|_\|/ \| \|/\| \| \|