summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added toolbar to comment formPhil Hughes2016-04-049-108/+129
|
* Restyling on elements in comment formPhil Hughes2016-04-0411-76/+76
|
* Started refactoring of note formPhil Hughes2016-04-046-39/+27
|
* Merge branch 'issue_14853' into 'master' Yorick Peterse2016-04-043-1/+28
|\ | | | | | | | | Fix bug related to filtering Issues by Label/Milestone. See merge request !3499
| * Fix bug related to filtering Issues by Label/Milestone.issue_14853Rubén Dávila2016-04-023-1/+28
| | | | | | | | This problem only was affecting the dev env.
* | Merge branch 'build-updates' into 'master' Douwe Maan2016-04-035-35/+124
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Build updates Fixes #10851 ![build-updates](/uploads/52e09e679ca457f3d818f9a12fd8382b/build-updates.gif) See merge request !2604
| * | Put back hiding of modalbuild-updatesPhil Hughes2016-03-211-0/+1
| | |
| * | Updated based on feedbackPhil Hughes2016-03-212-46/+60
| | |
| * | Removed modal hidePhil Hughes2016-03-181-1/+0
| | |
| * | Updated to fix issues risen during feedbackPhil Hughes2016-03-184-67/+53
| | | | | | | | | | | | Correctly updates the on-screen CI text feedback
| * | Merge request title is in the notificationPhil Hughes2016-03-183-4/+9
| | | | | | | | | | | | Short commit instead of long commit sha
| * | Commit SHA comes from JSONPhil Hughes2016-03-184-43/+49
| | | | | | | | | | | | Removed page refresh - instead clicking takes to the builds tab
| * | Fix code style issues.Jacob Schatz2016-03-181-3/+3
| | |
| * | Using status from ajax call.Jacob Schatz2016-03-182-25/+13
| | | | | | | | | | | | Removing icon changes because refresh.
| * | Removes name from fileJacob Schatz2016-03-182-4/+2
| | | | | | | | | | | | Changes `:not_found` to `nil`
| * | Checks if Notification API exists before requesting permission.Jacob Schatz2016-03-181-1/+2
| | |
| * | removing ci_enableJacob Schatz2016-03-182-3/+1
| | |
| * | Remove repeated build listingJacob Schatz2016-03-182-5/+4
| | |
| * | Add page reload as a temporary boring solutionJacob Schatz2016-03-182-3/+10
| | |
| * | Add icon as a opt for notifierJacob Schatz2016-03-182-3/+4
| | |
| * | Adds notifications API to MR page.Jacob Schatz2016-03-186-27/+93
| | | | | | | | | | | | | | | When a build status changes a notification will popup. Fixes #10851
| * | Adds JSON callback, which is currently not working.Jacob Schatz2016-03-184-10/+16
| | |
| * | initial ajax buildJacob Schatz2016-03-183-8/+22
| | |
* | | Merge branch 'add-ability-to-archive-a-project-via-api-14296' into 'master' Douwe Maan2016-04-034-0/+267
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add endpoints for archiving and unarchiving Closes #14296 See merge request !3372
| * \ \ Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296add-ability-to-archive-a-project-via-api-14296Zeger-Jan van de Weg2016-03-2980-1170/+1496
| |\ \ \
| * \ \ \ Merge branch 'master' into add-ability-to-archive-a-project-via-api-14296Zeger-Jan van de Weg2016-03-2423-116/+321
| |\ \ \ \
| * | | | | PUT becomes POST on archiving endpointsZeger-Jan van de Weg2016-03-244-43/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also the specs have a minor improvement. Mainly the access right spec. Changes are reflected in the docs
| * | | | | Add endpoints for archiving and unarchivingZeger-Jan van de Weg2016-03-233-0/+264
| | | | | |
* | | | | | Merge branch 'fix-bad-fetch' into 'master' Douwe Maan2016-04-032-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't fetch any tags from a forked repo Closes #13957 See merge request !3504
| * | | | | | Don't fetch any tags from a forked repoStan Hu2016-04-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13957
* | | | | | | Merge branch 'new-navigation-prototype' into 'master' Dmitriy Zaporozhets2016-04-0219-130/+109
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two level hierarchy in navigation sidebar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3494
| * | | | | | | Fix milestones tab active state and testsnew-navigation-prototypeDmitriy Zaporozhets2016-04-025-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Fix some active tab tests that are broken because of 2 level sidebarDmitriy Zaporozhets2016-04-014-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Some tweaks to new sidebarDmitriy Zaporozhets2016-04-015-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove tests with back buttonDmitriy Zaporozhets2016-04-014-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Improve styling for new complex sidebarDmitriy Zaporozhets2016-04-015-51/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Hide sidebar completely when collapsedDmitriy Zaporozhets2016-04-015-52/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Refactor left navigation sidebar to use 2 levelsDmitriy Zaporozhets2016-04-015-109/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Concept of 2 level navigation sidebarDmitriy Zaporozhets2016-04-012-113/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'dz-fix-nav-block' into 'master' Jacob Schatz2016-04-011-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove 1px whitespace between nav tabs and underline when form present Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3489
| * | | | | | | Remove 1px whitespace between nav tabs and underline when form presentdz-fix-nav-blockDmitriy Zaporozhets2016-04-011-1/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'notes-actions-colours' into 'master' Jacob Schatz2016-04-018-114/+112
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes/discussions header Part way towards getting the design for issues/merge requests to look more like the design in #3401 - I have standardised the headers for both issues & merge requests comments and discussions. See merge request !3441
| * | | | | | | Fixed alignment of iconsnotes-actions-coloursPhil Hughes2016-03-312-2/+10
| | | | | | | |
| * | | | | | | Tests updatePhil Hughes2016-03-311-4/+4
| | | | | | | |
| * | | | | | | SCSS variablesPhil Hughes2016-03-312-4/+11
| | | | | | | |
| * | | | | | | Standardised the discussion headersPhil Hughes2016-03-312-10/+10
| | | | | | | |
| * | | | | | | Changed some CSS to make it more concise & less overridingPhil Hughes2016-03-316-78/+58
| | | | | | | |
| * | | | | | | Moved project access into note actionsPhil Hughes2016-03-315-35/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a class for note action buttons
* | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable2016-04-0127-34/+47
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'routing' into 'master' Robert Speicher2016-04-0120-21/+34
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added & use Gitlab::Routing for URL helpers Extracted from !3389 See merge request !3486