summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge branch 'group_names_widget' into 'master' Dmitriy Zaporozhets2015-10-134-3/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project names are not fully shown if group name is too big, even on group page view https://dev.gitlab.org/gitlab/gitlabhq/issues/2548 ![joxi_screenshot_1444408109183](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c21ae245254b82db0212298b6f997067/joxi_screenshot_1444408109183.png) See merge request !1561
| | * | | | | | | | Project names are not fully shown if group name is too big, even on group ↵group_names_widgetValery Sizov2015-10-134-3/+6
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | page view
| * | | | | | | | Merge branch 'commit_status' into 'master' Kamil Trzciński2015-10-1335-343/+887
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Commit Status API This is preliminary implementation of Commit Status API, pretty much compatible with GitHub. 1. The Commit Statuses are stored in separate table: ci_commit_status. 2. The POST inserts a new row. 3. To POST execute GitLab API `post :id/repository/commits/:sha/status`. This accepts dual authorization: - Using authorized user - Using ci-token to allow easy posting from CI Services 4. This adds predefined variable to GitLab CI build environment: CI_BUILD_STATUS_URL, allowing to easy post status from within build (ex. with code coverage or other metrics). 5. This adds statuses to commit's builds view. 6. The commit's status is calculated taking into account status of all builds and all posted statuses. 7. The commit statuses doesn't trigger notifications. 8. The commit status API introduces two new privileges: `read_commit_statuses` and `create_commit_status`. 9. We still miss a few tests and documentation updates for API and CI. @dzaporozhets @sytses What do you think? See merge request !1530
| | * | | | | | | Fix retry and cancel URLscommit_statusKamil Trzcinski2015-10-131-2/+4
| | | | | | | | |
| | * | | | | | | Fix feature testsKamil Trzcinski2015-10-122-2/+2
| | | | | | | | |
| | * | | | | | | Fix broken matrix_for_ref?Kamil Trzcinski2015-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
| | * | | | | | | Fix broken testsKamil Trzcinski2015-10-123-7/+8
| | | | | | | | |
| | * | | | | | | Fix some changesKamil Trzcinski2015-10-122-2/+2
| | | | | | | | |
| | * | | | | | | Rename builds_without_retry to latest_buildsKamil Trzcinski2015-10-127-14/+14
| | | | | | | | |
| | * | | | | | | Fix commit skippingKamil Trzcinski2015-10-122-7/+7
| | | | | | | | |
| | * | | | | | | Update renderingKamil Trzcinski2015-10-126-87/+64
| | | | | | | | |
| | * | | | | | | Small bug fixesKamil Trzcinski2015-10-125-22/+39
| | | | | | | | |
| | * | | | | | | Add Commit Status documentationKamil Trzcinski2015-10-124-12/+94
| | | | | | | | |
| | * | | | | | | Add author to statusesKamil Trzcinski2015-10-124-1/+11
| | | | | | | | |
| | * | | | | | | Fix commit status POST URLKamil Trzcinski2015-10-122-4/+4
| | | | | | | | |
| | * | | | | | | Implement Commit Status APIKamil Trzcinski2015-10-1230-312/+767
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'css-cleanup' into 'master' Dmitriy Zaporozhets2015-10-137-25/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small css cleanup Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1582
| | * | | | | | | Small css cleanupcss-cleanupDmitriy Zaporozhets2015-10-137-25/+12
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'ui-improvements' into 'master' Dmitriy Zaporozhets2015-10-135-8/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ui improvements * fix dashboard projects page for mobile * fix project home page for mobile * remove gray padding for small screens * render no-ssh message same like we do for flash messages cc @skyruler See merge request !1581
| | * | | | | | | Several fixes for UI on mobileDmitriy Zaporozhets2015-10-132-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | Fix UI issue on project page with no ssh key messageDmitriy Zaporozhets2015-10-132-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | Fix control buttons in listsDmitriy Zaporozhets2015-10-131-1/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'refactor-styles' into 'master' Dmitriy Zaporozhets2015-10-139-170/+172
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor styles cc @skyruler See merge request !1577
| | * | | | | | | Temporary return sm and xs button sizesDmitriy Zaporozhets2015-10-131-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | Remove unused twbs componentsDmitriy Zaporozhets2015-10-132-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | Fix padding for controls in listDmitriy Zaporozhets2015-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | | Rename bootstrap css file and refactor typography cssDmitriy Zaporozhets2015-10-136-165/+162
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'refactor-styles' into 'master' Dmitriy Zaporozhets2015-10-1340-34/+48
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor css structure Related to #3025 cc @skyruler @DouweM @rspeicher @vsizov See merge request !1571
| | * | | | | | Fix typos in application.scssrefactor-stylesDmitriy Zaporozhets2015-10-121-4/+4
| | | | | | | |
| | * | | | | | Add css welcome noticeDmitriy Zaporozhets2015-10-121-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Re-organize GitLab css into 2 directories: framework and page specific cssDmitriy Zaporozhets2015-10-1234-28/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Move CI styles to pages dirDmitriy Zaporozhets2015-10-126-0/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Merge branch 'update_changelog2' into 'master' Valery Sizov2015-10-131-0/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update changelog https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1559 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1558 See merge request !1576
| | * | | | | update changelogValery Sizov2015-10-131-0/+2
| |/ / / / /
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-10-1222-43/+198
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'reset_service_password' into 'master' Dmitriy Zaporozhets2015-10-126-0/+158
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invalidate stored service password if the endpoint URL is changed See merge request !1558
| | | * | | | | Invalidate stored service password if the endpoint URL is changedreset_service_passwordValery Sizov2015-10-126-0/+158
| | | | | | | |
| | * | | | | | Merge branch 'spellcheck_false' into 'master' Dmitriy Zaporozhets2015-10-1212-12/+12
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spellcheck=false to certain input fields https://dev.gitlab.org/gitlab/gitlabhq/issues/2563 See merge request !1559
| | | * | | | | | Add spellcheck=false to certain input fieldsspellcheck_falseValery Sizov2015-10-1212-12/+12
| | | |/ / / / /
| | * | | | | | Merge branch 'fix-patch_guide' into 'master' Hannes Rosenögger2015-10-121-2/+4
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't set LATEST_TAG automatically in patch update guide As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/2607, this removes the automatic setting of the LATEST_TAG variable in the update guide, because it could get set to rc versions. Instead, a command was added to list all tags, with the most recent one being on the end of the list. Also a note was added to prevent users from updating to new minor/major versions because the tag list includes all tags. [ci skip] See merge request !1510
| | | * | | | | don't set LATEST_TAG automatically in patch update guideJan Bruckner2015-10-051-2/+4
| | | | | | | |
| | * | | | | | Merge branch 'docs-update' into 'master' Hannes Rosenögger2015-10-121-28/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed extra_sign_in_text examples for gitlab.rb [ci skip] I removed the extra_sign_in_text option documentation. This is no longer needed because a welcome message aka. extra_sign_in_text can now be set/changed in the admin UI. Admin area > Settings This was mentioned in issue #3006 See merge request !1565
| | | * | | | | | removed extra_sign_in_text examples for gitlab.rb [ci skip]Dale Noe2015-10-111-28/+2
| | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'fix_email_downcasing' into 'master' Robert Speicher2015-10-112-1/+22
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP email address downcasing Fixes #2960 In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved. This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression. See merge request !1550
| | | * | | | | Fix ldap email downcasing bugDrew Blessing2015-10-082-1/+22
| | | | | | | |
| * | | | | | | Merge pull request #9719 from teuneboon/masterStan Hu2015-10-121-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Small typo fix when deleting groups
| | * | | | | | Make group deleted text consistent with group created and updated textsteuneboon2015-10-121-1/+1
| | | | | | | |
| | * | | | | | Fix typo(missing quote) when deleting groupsteuneboon2015-10-121-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'rs-remove-slim' into 'master' Dmitriy Zaporozhets2015-10-102-6/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove slim Closes #2897 See merge request !1537
| | * | | | | | Remove slimrs-remove-slimRobert Speicher2015-10-082-6/+0
| | |/ / / / /